Commit Graph

5636 Commits

Author SHA1 Message Date
Kim Kulling
674a47dd3e closes https://github.com/assimp/assimp/issues/567: prevend dependency cycle 2018-02-08 20:24:18 +01:00
Kim Kulling
48d41b4bf9 Merge pull request #1766 from assimp/issue_774
closes https://github.com/assimp/assimp/issues/774: use correct type …
2018-02-04 19:05:02 +01:00
Kim Kulling
1a9f17e13d Merge branch 'master' into issue_774 2018-02-04 18:33:22 +01:00
Kim Kulling
8284226efd fbx: add missing test file. 2018-02-04 17:19:49 +01:00
Kim Kulling
c5157bc471 fbx: global settings use float instead of double. 2018-02-04 17:13:58 +01:00
Kim Kulling
37d352622b closes https://github.com/assimp/assimp/issues/774: use correct type for unitscale in fbx. 2018-02-04 16:42:36 +01:00
Kim Kulling
c8afa8daec Merge pull request #1764 from assimp/issue_1583
Issue 1583
2018-02-03 19:01:47 +01:00
Kim Kulling
970554c906 Merge branch 'master' into issue_1583 2018-02-03 17:48:03 +01:00
Kim Kulling
7b4f916b13 Merge pull request #1765 from turol/misc
Miscellaneous fixes
2018-02-03 17:47:25 +01:00
Kim Kulling
61816837e5 Merge branch 'master' into issue_1583 2018-02-03 17:22:32 +01:00
Turo Lamminen
5278e1a5f8 CSM: Fix a possible memory leak by using std::unique_ptr 2018-02-03 17:52:25 +02:00
Turo Lamminen
cfcaf3e97b BVH: Initialize all members of Node in constructor 2018-02-03 17:38:30 +02:00
Turo Lamminen
da19ed0b2a BaseImporter: Remove dead condition
operator new never returns NULL, it throws exception on allocation failure
2018-02-03 17:25:31 +02:00
Turo Lamminen
be865ae613 LimitBoneWeightsProcess: Initialize all members of Weight in constructor 2018-02-03 17:19:27 +02:00
Turo Lamminen
9397932e4f PretransformVertices: Rearrange some assignments to clarify things 2018-02-03 17:08:25 +02:00
Turo Lamminen
123b9ca71a Initialize all members of aiMeshKey in constructor 2018-02-03 16:54:19 +02:00
Turo Lamminen
e21b79a8bf Mark Importer assignment operator deleted 2018-02-03 16:45:07 +02:00
Turo Lamminen
b0b125dfe6 Initialize all members of aiVertexWeight in constructor 2018-02-03 16:34:40 +02:00
Turo Lamminen
82980c8a9c Add missing assignment operator to aiBone 2018-02-03 16:24:45 +02:00
Turo Lamminen
a64d515505 Fix varible shadowing issue 2018-02-03 16:04:14 +02:00
Turo Lamminen
6aafc58797 Add missing assignment operator to aiString 2018-02-03 15:51:20 +02:00
Kim Kulling
1fbfe6736e Update dox.h
Update installation guide for linux and python.
2018-02-03 11:52:40 +01:00
Kim Kulling
45e4a513de add cmake doc to doxygen-docu. 2018-02-03 11:07:40 +01:00
Kim Kulling
7de0453b46 Merge pull request #1763 from assimp/issue_1752
closes https://github.com/assimp/assimp/issues/1752: move guard over …
2018-02-03 09:56:02 +01:00
Kim Kulling
01e4d07c1e closes https://github.com/assimp/assimp/issues/1583: update doc. 2018-02-03 09:42:07 +01:00
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
455ff4ab81 Merge pull request #1762 from assimp/issue_1758
closes https://github.com/assimp/assimp/issues/1758: fix compiler war…
2018-02-02 22:04:45 +01:00
Kim Kulling
9740243e6b Merge branch 'master' into issue_1758 2018-02-02 20:36:40 +01:00
Kim Kulling
7ca8407ef2 Merge pull request #1756 from sacereda/unzipExt
including <unzip.h> instead of <contrib/unzip/unzip.h>
2018-02-02 20:32:34 +01:00
Kim Kulling
84957faa16 closes https://github.com/assimp/assimp/issues/1758: fix compiler warning. 2018-02-02 19:50:34 +01:00
Kim Kulling
58d1ef6492 Merge branch 'master' into unzipExt 2018-02-01 19:21:09 +01:00
Kim Kulling
7de5e723d8 Merge pull request #1759 from mesilliac/fix_matrix_rotation_decompose
Fix Matrix4x4t Decompose to rotation vector.
2018-02-01 19:20:39 +01:00
Tommy
35f2d8c907 Fix Matrix4x4t Decompose to rotation vector.
The calculation of the rotation matrix was for left-handed
coordinates with row-vectors, but assimp uses right-handed
coordinates and column-vectors.
2018-02-01 18:11:14 +01:00
Kim Kulling
e22f5161f5 Merge pull request #1757 from assimp/issue_905
closes https://github.com/assimp/assimp/issues/905: add missing contr…
2018-02-01 00:37:45 +01:00
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