Commit Graph

3234 Commits (123b9ca71a299741f5addaa9752c3dbca3053712)

Author SHA1 Message Date
Kim Kulling d47f34344e closes https://github.com/assimp/assimp/issues/1752: move guard over include statement. 2018-02-03 08:46:03 +01:00
Kim Kulling 58d1ef6492
Merge branch 'master' into unzipExt 2018-02-01 19:21:09 +01:00
Kim Kulling a1963feab7
Merge branch 'master' into warning4221 2018-01-31 20:27:45 +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 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 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 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 25c5384208
Merge branch 'master' into master 2018-01-25 09:11:14 +01:00
Kim Kulling 2e7e16b52b
Merge branch 'master' into issue_1728 2018-01-24 23:58:55 +01:00
Kim Kulling 1037ac5b93
Merge branch 'master' into issue_1721 2018-01-24 21:57:53 +01:00
Kim Kulling 5baba37414 closes https://github.com/assimp/assimp/issues/1728: check if mesh is a null instance before dereferencing it. 2018-01-24 21:43:36 +01:00
Giuseppe Barbieri 47a2775b94
Update FBXConverter.cpp
Renamed nested looping variable
2018-01-24 21:30:25 +01:00
Kim Kulling 0b15d5cd46 closes https://github.com/assimp/assimp/issues/1721: set camera parameters instead of nonsense. 2018-01-24 21:20:34 +01:00
Turo Lamminen a8fd9f668f ASE: Explicitly write out Material move constructor and assignment operator
Because MSVC doesn't support defaulting them
2018-01-24 12:25:30 +02:00
Turo Lamminen cbd7916ced 3DS: Explicitly write out Material move constructor and assignment operator
Because MSVC doesn't support defaulting them
2018-01-24 12:11:19 +02:00
Turo Lamminen e6ff15d201 3DS: Initialize Material name in initializer list 2018-01-23 20:41:26 +02:00
Turo Lamminen 4acd96d405 3DS: Remove Material default constructor 2018-01-23 20:36:51 +02:00
Turo Lamminen dd7035372d 3DS: Pass default material name to constructor instead of changing after the fact 2018-01-23 20:36:05 +02:00
Turo Lamminen 10246bf052 3DS: Pass default material name to Material constructor 2018-01-23 20:29:46 +02:00
Turo Lamminen f2ec3eeeb8 ASE: Delete Material default constructor 2018-01-23 20:20:37 +02:00
Turo Lamminen 209966ef35 ASE: Pass default material name to constructor 2018-01-23 20:15:21 +02:00
Turo Lamminen 1b28124f21 ASE: Pass a default material name when resizing submaterials buffer 2018-01-23 19:54:16 +02:00