Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

12783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wil Shipley
90a07713c0 Added 'const' to () operator on CompareVector 
So it can build on clang.
 2015-03-11 16:55:21 -07:00
Kim Kulling
d9d7dd31ea fix linker error: undefined references to openddl_parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-11 19:05:37 +01:00
Alexander Gessler
163bbc25c7 Merge pull request #486 from DenisMikhalev/issue-2 
Adds safety and prevents crashes for damaged files
 2015-03-10 16:09:07 +01:00
Léo Terziman
f120a75617 Merge remote-tracking branch 'official/master' into contrib 2015-03-10 15:40:03 +01:00
Léo Terziman
18e6a8fbdb improved handling of commas in fast_atof 2015-03-10 15:39:27 +01:00
DenisMikhalev
615041ba15 Add license file for ant-half.ply 2015-03-10 15:00:49 +03:00
Léo Terziman
8ae9e2b555 In Collada: Added missing description of importer specific options 2015-03-10 09:20:00 +01:00
DenisMikhalev
fa8cdb241d Move ply file to models-nonbsd dir 2015-03-10 09:18:23 +03:00
Alexander Gessler
3c56e978f7 Merge pull request #484 from turol/master 
Fix read past end of buffer after call to TokenMatch
 2015-03-10 00:29:25 +01:00
DenisMikhalev
80bfe7929e Adds half of file for testing crash PlyLoader 2015-03-09 19:51:04 +03:00
DenisMikhalev
62676b56aa Adds safety and prevents crashes for damaged files 2015-03-09 19:40:13 +03:00
Turo Lamminen
ba4689fd05 Whitespace 2015-03-09 12:33:13 +02:00
Turo Lamminen
c342778f42 Fix read past end of buffer after call to TokenMatch 
IsSpaceOrNewLine returns true on end of input (NUL character). But if
TokenMatch considers a token at end of input to match it sets "in" to
one past end of buffer. This will lead to reading past the end of
buffer on any subsequent operation.
 2015-03-09 12:33:13 +02:00
Léo Terziman
18ef31cc06 Merge remote-tracking branch 'official/master' into contrib 2015-03-09 11:31:15 +01:00
Kim Kulling
79db48a0d1 openddl-parser: latest greatest. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-09 10:17:23 +01:00
Alexander Gessler
7d3d66936b Merge pull request #483 from DenisMikhalev/issue-482 
Use material names, set default direction to UP_Y, process extra tag
 2015-03-08 22:15:39 +01:00
DenisMikhalev
c410512173 Use material names, set default direction to UP_Y, process extra tag 2015-03-08 22:37:48 +03:00
Kim Kulling
727888ea10 Merge pull request #480 from turol/subdiv-memory 
Free edges map before recursive calls to reduce memory consumption
 2015-03-08 10:32:26 +01:00
Kim Kulling
d4c0529514 Merge pull request #481 from abma/master 
addition to c4997f16db (#476)
 2015-03-08 10:30:07 +01:00
abma
873ae5db3f addition to c4997f16db 
(thanks turol)
 2015-03-08 03:26:25 +01:00
Turo Lamminen
c89274d366 Free edges map before recursive calls to reduce memory consumption 2015-03-08 00:16:48 +02:00
ulf
76c69205b1 - reintroduced IFC openings to floors and ceilings. Were disabled for some unknown reasons, I hope I didn't break anything. Everything I tested works fine. 2015-03-06 14:14:45 +01:00
Madrich
5fedf5279c Merge pull request #2 from assimp/master 
Update from assimp Master
 2015-03-05 22:14:43 +01:00
ulf
03a7f36858 Merge branch 'master' of https://github.com/assimp/assimp 2015-03-05 20:18:00 +01:00
ulf
a2c9904d59 - Bugfix: polygon-bounded half space clipping now assumes plane in correct coordinate space 
- Bugfix: closing polygon loop along boundary polygon now correctly projects boundary vertices to polygon plane
 2015-03-05 20:17:26 +01:00
ulf
0cdc528e01 - Bugfix: IFC loader tested squared length against non-squared epsilon in RemoveDegenerates() 2015-03-03 15:56:09 +01:00
Kim Kulling
1e4e105bae Merge pull request #476 from abma/master 
remove "register" keyword:
 2015-03-03 09:26:25 +01:00
abma
c4997f16db remove "register" keyword: 
clang warns: 'register' storage class specifier is deprecated
http://stackoverflow.com/questions/10675072/is-the-register-keyword-still-used
 2015-03-02 23:44:02 +01:00
Alexander Gessler
b1e8c192db Merge pull request #464 from turol/master 
Clean up some warnings
 2015-02-28 14:41:26 +01:00
Alexander Gessler
579382ad91 Merge pull request #472 from assimp/fix471 
Update IfcLoader to use numeric_limits<uint32_t> instead of UINT32_MAX, ...
 2015-02-28 14:27:59 +01:00
Alexander Gessler
f6f8462113 Update IfcLoader to use numeric_limits<uint32_t> instead of UINT32_MAX, fixes gcc build and is more consistent with the rest of the codebase. Fixes #471. 2015-02-28 13:40:10 +01:00
Turo Lamminen
5a74e07f5f Mark some more functions with AI_WONT_RETURN 2015-02-27 23:09:12 +02:00
Turo Lamminen
db6d8a4dc5 Use attribute noreturn on both GCC and Clang 
Both GCC and Clang define __GNUC__ and both also understand
attribute noreturn.
 2015-02-27 23:09:12 +02:00
Turo Lamminen
dfd171be6d Remove unnecessary semicolons after FBXDocument property declarations 2015-02-27 23:09:12 +02:00
Turo Lamminen
308884f144 Remove unnecessary semicolons after function definition 
Picked up by clang -Wextra-semi
 2015-02-27 23:09:12 +02:00
Turo Lamminen
e8bcad0840 Silence a warning and add an assertion 
Another false positive uninitialized variable. Actually it's only false
if ToOutputVertexIndex does't return NULL which should only happen if
index is out of bounds. Add assertion to make sure of that.
 2015-02-27 23:09:03 +02:00
ulf
b71ded1ad0 - manually merged C4D importer code from acgessler branch 
- manually merged IFC bugfixes and improvements from schrompf branch
 2015-02-23 14:23:28 +01:00
Léo Terziman
2274c96e3b Merge remote-tracking branch 'official/master' into contrib 2015-02-18 17:22:44 +01:00
Léo Terziman
d9a2293491 Improved handling of transparency in collada importer 
+ started preliminary support for RGB_ZERO collada transparency mode
+ added option to manually invert transparency values to deal with broken exporters that don't follow the specs
 2015-02-18 17:20:03 +01:00
Alexander Gessler
7c38a33225 Merge pull request #466 from mbp566/master 
Fixed many doxygen errors
 2015-02-18 12:15:33 +01:00
mbp566
7bab42f55f Fixed many doxygen errors 2015-02-18 17:02:30 +09:00
Alexander Gessler
51b790c482 ColladaLoader: format. 2015-02-15 22:26:59 +01:00
Alexander Gessler
ce1302cd71 Fix VC12 warning "empty but controlled statement found". 2015-02-15 22:20:34 +01:00
Alexander Gessler
aae0f7e7b1 3DSExporter: export materials first, then meshes. Our own importer requires this. 2015-02-15 22:12:19 +01:00
Alexander Gessler
3f104fc080 Merge branch 'master' of github.com:assimp/assimp 2015-02-15 21:54:13 +01:00
Kim Kulling
0292868917 add geomentry node handling. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-14 16:12:09 +01:00
Kim Kulling
f5f0c9f7cf update openddl-parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-14 16:11:46 +01:00
Turo Lamminen
570d02ff6e Silence more uninitialized variable warnings 
These are false positives since aiMaterial::Get will have written to output
if it returns AI_SUCCESS but the compiler can't see that.
 2015-02-13 13:15:26 +02:00
Turo Lamminen
f708d0b122 Silence some uninitialized variable warnings 
These are false positives but the compiler isn't smart enough to see that.
Also it might make more sense to use switch here.
 2015-02-13 12:21:59 +02:00
Turo Lamminen
84a9514d4b Fix warning about possibly uninitialized variable 
It might be better to move FindEmptyUVChannel call earlier
 2015-02-13 12:14:39 +02:00