Commit Graph

34 Commits

Author SHA1 Message Date
Kim Kulling
627cb93b0b Merge branch 'master' into topic/fragmented_embedded_textures 2019-05-19 20:16:49 +02:00
Mike Samsonov
c84ac7a135 Fragmented FBX ASCII emdedded resource 2019-05-16 11:59:23 +01:00
Mike Samsonov
4e03a2c00d Exception spam fix for FBXMaterial 2019-05-16 11:58:07 +01:00
Matias Lavik
015e960d0e Merge branch 'master' into issue_1957 2019-04-06 22:22:05 +02:00
Matias Lavik
b3177a2a9a issue 1957: Added support for reading embedded content (textures) in ASCII FBX. In ASCII FBX embedded content is encoded in Base64 and is surrounded by double quotation marks. The decoding functions are based on those used in the glTF importer. 2019-04-06 19:31:56 +02:00
Matias Lavik
898e59d8ee Merge branch 'master' into issue_2043 2019-04-04 16:36:44 +02:00
Matias
20acce1c5e Suggested fix for issue : If available, use "Scaling" and "Translation" instead of "ModelUVScaling" and "ModelUVTranslation". This seems to be what 3DS Max and FBX SDK use. 2019-04-04 16:31:34 +02:00
Charlie Gettys
f15f37634d BlenderDNA.h:
* Fix rethrow that would crash the program.
* QUESTION: am I throwing the right exception here.

COBLoader:
* catch exception by const ref
* fix equality checks using strncmp taht weren't actually checking equality

FBXMaterial: Catch exception by const ref (+ Debug log that it's done so)

FBXConverter: Rename local variables to avoid shadowing parameter

ImageExtractor: Remove duplicated/unreachable code

FBXConverter: Another shadowed variable fix

MD5Loader: 2 shadowed variables

IRRLoader: shadowed parameter

StepFileReader.cpp: Shadowed parameter

IRRLoader: remove empty else statement

STLExporter: Throw error instead of silently ignoring unimplemented option

Misc empty blocks removed or debug logging added
2019-03-30 16:08:25 -04:00
kimkulling
a06133ab52 Update copyrights. 2019-01-30 09:41:39 +01:00
Alexandre Avenel
2879e0d6ef Fix typos on code using codespell 2018-05-13 16:35:03 +02:00
Tommy
9f02c8a97c Fix default opacity of materials exported to FBX by Blender. 2018-03-07 09:15:08 +01:00
Kim Kulling
b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
BuildTools
66171de915 Successful lib build, unit testing still WIP 2018-01-05 16:18:33 -08:00
Tommy
47c422ea49 Fix non-ascii encoding in comments in FBXMaterial.cpp.
It looks like it was just saved with a wrong encoding,
as these 0xB4 characters were in place of "'".

Also converted tabs to spaces to match indent in the rest of the file.
2017-12-17 16:40:12 +01:00
rickomax
c86013b08d Fixed many FBX bugs
Fixed a bug where FBX loader won´t load embedded textures that don´t have the Content data filled. Some FBX files only fill this data once, so any embedded texture with the same source filename, should use the pre-loaded data.

Fixed another bug where FBX Texture "Filename" field came different than  on some files than the one defined by the code. One suggestion is load all properties by the case-insensitive function created.

Added the "AI_CONFIG_IMPORT_FBX_SEARCH_EMBEDDED_TEXTURES" flag to tell the importer to load embedded texture data from already loaded ones.
2017-07-15 00:27:33 -03:00
Kim Kulling
a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
roshan.c
27f81884f9 adding support to store all the layered textures 2016-08-15 09:58:53 -07:00
mensinda
18843fe5e1 Replaced BOOST_FOREACH with c++11 ranged for loops 2016-04-05 22:53:54 +02:00
Kim Kulling
1191d03405 Update license info. 2016-01-01 21:07:24 +01:00
Otger
f94bc8d66e Initial support for FBX embedded textures 2015-11-23 19:49:54 +01:00
Richard
83de707587 Refactor: Expand tabs to 4 spaces 2015-06-28 16:04:15 -06:00
Richard
a96a595a7a Refactor: Trim trailing whitespace 2015-06-28 16:01:32 -06:00
Kim Kulling
2bfc353fde License info: update year info. 2015-06-28 21:48:25 +02:00
abma
bf4913b5c9 remove AssimpPCH.h: fixes #534 2015-04-16 01:00:17 +02:00
abma
6c5f9ecb06 fix most warnings with -pendantic 2014-08-18 02:09:06 +02:00
attila-barsi
ed9204ab1b Initial version for FBX layered textures.
Fixed assert during parsing UDP3DSMAX.
2014-03-24 11:46:36 +01:00
Alexander Gessler
17629f1ff1 - fbx: work on resolving material links. 2012-07-04 15:07:57 +02:00
Alexander Gessler
a0c45f9190 - fbx: read texture -> material connections. 2012-07-03 19:42:14 +02:00
Alexander Gessler
effcaf066a - fbx: Objects now carry their ID. 2012-07-03 19:36:38 +02:00
Alexander Gessler
fd451f7ba6 - fbx: read object-object and object-property connections. 2012-07-03 16:50:58 +02:00
Alexander Gessler
23914685f9 - fbx: read textures. 2012-07-03 14:59:40 +02:00
Alexander Gessler
97b69364ad - fbx: refactor code for fetching property templates. 2012-07-03 14:40:45 +02:00
acgessler
131008cea1 - fbx: read materials. 2012-07-02 17:37:00 +02:00
acgessler
00f249b8dd - fbx: add property system 2012-07-02 15:57:51 +02:00