v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,060 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

6060 Commits (224b43a3a9c8993c0ca96b1189ba91d968fe4e5d)

Author SHA1 Message Date
Kim Kulling 280c995191 closes https://github.com/assimp/assimp/issues/905: add missing contrib source from zlib. 2018-01-31 22:55:05 +01:00
Kim Kulling bde95eb771
Merge pull request #1749 from sacereda/warning4221 
Warning LNK4221 when not building exporter.
 2018-01-31 22:01:18 +01:00
Kim Kulling a1963feab7
Merge branch 'master' into warning4221 2018-01-31 20:27:45 +01:00
Kim Kulling 0384576536
Merge pull request #1755 from assimp/kimkulling-introduce-static 
Update OgreXmlSerializer.cpp
 2018-01-31 10:41:59 +01:00
Kim Kulling 2714e146e0
Update OgreXmlSerializer.cpp 
- Make constats static
- add asserts to check against nullptr dereferencing
 2018-01-31 09:57:34 +01:00
Sergio Acereda 8f99c1a0be including <unzip.h> instead of <contrib/unzip/unzip.h> 2018-01-30 22:13:44 +01:00
Kim Kulling 46e9d1321d
Merge branch 'master' into warning4221 2018-01-30 21:41:44 +01:00
Turo Lamminen 0780d2daae
Merge pull request #1753 from turol/threadsafe 
Fix thread-safety false positives in Ogre importer
 2018-01-30 21:56:52 +02:00
Turo Lamminen 388ec8461c Ogre: Change OgreXmlSerializer::ReadAttribute parameter from std::string to pointer 2018-01-30 20:12:46 +02:00
Turo Lamminen cfc9a69512 Ogre: Don't create std::strings in global scope where char pointer will do 2018-01-30 20:03:28 +02:00
Turo Lamminen 0c66b3902e Ogre: Avoid creating static std::strings 
They're causing false positive race condition messages from Helgrind
 2018-01-30 19:47:15 +02:00
Turo Lamminen 12396d0ce3 Ogre: Change OgreXmlSerializer::HasAttribute parameter from std::string to pointer 
It's immediately passed via string pointer and in most places
it's already a raw string constant.
 2018-01-30 19:42:58 +02:00
Sergio Acereda be33feba44 Warning LNK4221 when not building exporter. 2018-01-29 12:39:40 +01:00
Kim Kulling 87ce90665f
Merge pull request #1748 from assimp/new_license_dates 
New license dates
 2018-01-28 23:07:33 +01:00
Kim Kulling bd29fe73fa Merge branch 'master' into new_license_dates 2018-01-28 20:16:17 +01:00
Kim Kulling b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
Turo Lamminen 9f304d36df
Merge pull request #1745 from turol/threadsafe 
Fix more thread-safety issue in 3DS and ASE loaders
 2018-01-27 20:19:32 +02:00
Turo Lamminen e0cbd92da4 ASE: Delete BaseNode constructor which doesn't take name 2018-01-27 18:48:57 +02:00
Turo Lamminen 4b20e9712c ASE: Explicitly pass "DUMMY" as Dummy node name 2018-01-27 18:48:57 +02:00
Turo Lamminen 2d1bd1eec4 ASE: Delete Camera default constructor 2018-01-27 18:48:57 +02:00
Turo Lamminen 7fef5e6d23 ASE: Explicitly pass "UNNAMED" as default camera name 2018-01-27 18:48:57 +02:00
Turo Lamminen 945f2bed09 ASE: Add Camera constructor which takes name 2018-01-27 18:48:57 +02:00
Turo Lamminen 039ca38542 ASE: Delete Light default constructor 2018-01-27 18:48:57 +02:00
Turo Lamminen 4fd791796c ASE: Explicitly pass "UNNAMED" as default Light name 2018-01-27 18:48:57 +02:00
Turo Lamminen f3d702339c ASE: Add Light constructor which takes name 2018-01-27 18:48:57 +02:00
Turo Lamminen 17f801ae8a ASE: Delete Mesh default constructor 2018-01-27 18:48:57 +02:00
Turo Lamminen 59ab30cb25 ASE: Explicitly pass "UNNAMED" as default mesh name 2018-01-27 18:48:57 +02:00
Turo Lamminen f3474fb399 ASE: Add Mesh constructor which takes name 2018-01-27 18:48:57 +02:00
Turo Lamminen 3874720947 ASE: Add BaseNode constructor which takes name 2018-01-27 18:48:57 +02:00
Turo Lamminen 1836b00f51 ASE: Delete Bone default constructor 2018-01-27 18:48:57 +02:00
Turo Lamminen e75f7a5964 ASE: Explicitly pass "UNNAMED" as default bone name 2018-01-27 18:48:57 +02:00
Turo Lamminen 3f377e11f5 3DS: Delete Node default constructor 2018-01-27 18:48:57 +02:00
Turo Lamminen 0d69b15238 3DS: Explicitly pass "UNNAMED" as 3DS root node name 2018-01-27 18:48:57 +02:00
Turo Lamminen 6c23b57208 3DS: Pass name to Node constructor 2018-01-27 18:48:57 +02:00
Turo Lamminen 56a19ac492 3DS: Add Node constructor which takes name 2018-01-27 18:48:57 +02:00
Turo Lamminen c0c06093b4 3DS: Whitespace 2018-01-27 18:48:57 +02:00
Turo Lamminen 8c219c7bd1 3DS: Delete Mesh default constructor 2018-01-27 18:48:57 +02:00
Turo Lamminen 93fa373206 3DS: Pass name to Mesh constructor 2018-01-27 18:48:57 +02:00
Turo Lamminen b580064414 3DS: Add Mesh constructor with takes name 2018-01-27 18:48:57 +02:00
Kim Kulling 5463757688
Merge pull request #1744 from assimp/issue_1743 
closes https://github.com/assimp/assimp/issues/1743: introduce /bigob…
 2018-01-27 17:22:25 +01:00
Kim Kulling 98325ee95d closes https://github.com/assimp/assimp/issues/1743: introduce /bigobj compile flag. 2018-01-27 09:20:22 +01:00
Kim Kulling 257e05ae76
Merge pull request #1741 from loebl/doc/find_degenerates_parameters 
Add note to aiProcess_FindDegenerates about AI_CONFIG_PP_FD_CHECKAREA
 2018-01-26 17:16:43 +01:00
Kim Kulling 6cde21bf2f
Merge branch 'master' into doc/find_degenerates_parameters 2018-01-25 20:34:28 +01:00
Daniel Löber cec006f74b Add note to aiProcess_FindDegenerates about AI_CONFIG_PP_FD_CHECKAREA 2018-01-25 14:56:37 +01:00
Kim Kulling 71549084c5
Merge pull request #1737 from elect86/master 
Inserted a space + renaming nested looping variable
 2018-01-25 10:26:17 +01:00
Kim Kulling 25c5384208
Merge branch 'master' into master 2018-01-25 09:11:14 +01:00
Kim Kulling 39ce3e1309
Merge pull request #1738 from assimp/issue_1728 
closes https://github.com/assimp/assimp/issues/1728: check if mesh is…
 2018-01-25 09:10:41 +01:00
Kim Kulling 2e7e16b52b
Merge branch 'master' into issue_1728 2018-01-24 23:58:55 +01:00
Kim Kulling 68aedce7b2
Merge pull request #1736 from assimp/issue_1721 
closes https://github.com/assimp/assimp/issues/1721: set camera param…
 2018-01-24 23:58:40 +01:00
Kim Kulling 1037ac5b93
Merge branch 'master' into issue_1721 2018-01-24 21:57:53 +01:00