72b5ed50e9
Bump just to get AppVeyor to re-test it.
2016-02-07 13:21:58 -08:00
2466ae6c2e
Merge pull request #789 from assimp/revert-771-obj_load_forever_fix
...
Revert "Fix issue: OBJ import takes forever (#759 ) (attempt 2)"
2016-02-07 20:03:38 +01:00
37a3976b30
Revert "Fix issue: OBJ import takes forever ( #759 ) (attempt 2)"
2016-02-07 20:03:24 +01:00
c084a47c5d
Merge pull request #771 from andrewparlane/obj_load_forever_fix
...
Fix issue: OBJ import takes forever (#759 ) (attempt 2)
2016-02-07 20:00:03 +01:00
a998055cbd
OpenDDLParser: add missing files.
2016-02-07 17:59:56 +01:00
522f4e0882
Closes https://github.com/assimp/assimp/issues/786 :
...
- fix invalid value get for index data.
- update OpenDDL-library
2016-02-07 17:58:28 +01:00
7961c22c55
Closes https://github.com/assimp/assimp/issues/787 : Update CHANGES.
2016-02-06 20:54:47 +01:00
dfbae1294f
JoinVerticesProcess: iAdd test for possible null pointer access.
2016-02-05 18:53:23 +01:00
51c9a9f80c
Unittests: add test if export is disabled.
2016-02-05 18:31:19 +01:00
f7d979c46e
Merge pull request #783 from snikulov/gtest_upd
...
updated gtest repository to github
2016-02-05 18:04:01 +01:00
982d597acf
updated gtest to github
2016-02-05 13:11:40 +03:00
a74b321ed1
Add unittests for defect reproduction.
2016-02-04 20:43:02 +01:00
699aa9c583
Closes https://github.com/assimp/assimp/issues/754 : use correct index
...
token.
2016-02-03 21:09:20 +01:00
2dc6ea85ec
Merge branch 'master' of https://github.com/assimp/assimp
2016-02-03 20:20:16 +01:00
aff932cd9c
Fix license date.
2016-02-03 20:19:59 +01:00
aef69ffe91
Merge pull request #779 from turol/master
...
SIBImporter: Properly fix C++11 issues for Clang
2016-02-02 20:40:52 +01:00
0e06404ec1
SIBImporter: Properly fix C++11 issues for Clang
...
C-style cast has a higher precedence than & -operator so this was getting
parsed differently than Kim assumed. Thou shalt not use C-style casts.
2016-02-02 20:29:40 +02:00
d9f133edec
Doc: add missing ports to start README page.
2016-02-02 17:48:23 +01:00
b77228c7ea
Android build doc: reformatting.
2016-02-02 11:00:28 +01:00
219bf32efe
Rename android renameRename android rename.
2016-02-02 10:59:07 +01:00
7233aedac3
DOC: add link to ports in global readme.
2016-02-02 10:58:15 +01:00
72d720ecfb
Doc: use markup format for android build instructions.
2016-02-02 10:52:28 +01:00
59ece7b9fa
Datatypes: add missing unions for vector + color types.
2016-02-02 00:59:47 +01:00
aaec1656f3
Closes https://github.com/assimp/assimp/issues/43 : provide different
...
matrix scheme via union.
2016-02-01 16:16:48 +01:00
a1bd83d797
ai_assert: split 2 checks in one macro to 2 separate ai_assert tests.
2016-02-01 16:16:09 +01:00
f1666d22ce
Closes https://github.com/assimp/assimp/issues/778 : export android system.
2016-01-31 13:44:15 +01:00
9f9f69d6cc
AndroidJNIIOSystem: update license info to 2016.
2016-01-31 13:43:05 +01:00
16fffb2ab1
Merge branch 'master' of https://github.com/assimp/assimp
2016-01-31 00:42:02 +01:00
a37ea18f09
SIBImporter: fix c++14 compilation issue for clang.
2016-01-31 00:41:14 +01:00
bcd38707c5
3DSConverter: fix level 4 compiler warning.
2016-01-29 21:22:41 +01:00
c571b92dd7
bug fix
2016-01-28 08:06:52 -08:00
bac6067869
gltf: make code more radable and check against one possible null ptr
...
access.
2016-01-27 20:26:38 +01:00
0e7446af83
Merge branch 'master' of https://github.com/assimp/assimp
2016-01-27 18:49:26 +01:00
8bbd55a790
PostProcessing: first prototype of customized post processing.
2016-01-27 18:49:01 +01:00
f473b17c99
Merge pull request #773 from boxdot/master
...
Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.
2016-01-27 17:20:26 +01:00
ce9ae0ae53
Merge pull request #772 from abma/master
...
fix new / delete missmatch
2016-01-27 17:19:52 +01:00
13ec11bca8
Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.
2016-01-27 02:12:15 +01:00
b3b08728fa
fix new / delete missmatch
2016-01-26 22:47:50 +01:00
109f6feb6e
ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code.
...
Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.
This time I've fixed the order of evaluation bug in the call to getFace().
2016-01-25 20:44:31 -04:00
c7d86e97cc
ObjTools: Update getName() to work with const iterators.
...
Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.
2016-01-25 20:43:34 -04:00
11d0085f4d
Merge pull request #770 from assimp/revert-765-master
...
Revert "Fix issue: OBJ import takes forever (#759 )"
2016-01-26 00:14:27 +01:00
4633266c31
Revert "Fix issue: OBJ import takes forever ( #759 )"
2016-01-25 23:53:59 +01:00
f23285a1ce
Fixed whitespace to match coding standard.
2016-01-25 13:45:08 -08:00
94a35dfdd2
Fixed NULL pointers to match coding standards.
2016-01-25 13:42:30 -08:00
d58f5613dd
Merge pull request #765 from andrewparlane/master
...
Fix issue: OBJ import takes forever (#759 )
2016-01-24 19:36:18 +01:00
9969167c2a
ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code.
...
Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.
2016-01-23 20:01:44 -04:00
ce64dfb3fd
ObjTools: Update getName() to work with const iterators.
...
Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.
2016-01-23 20:01:44 -04:00
ae2cce0899
Validation fix for empty scenes.
...
The validator requires empty scenes to have NULL pointers.
2016-01-23 15:22:48 -08:00
0e4cf64a45
Merge pull request #763 from andrewparlane/mtlFix
...
ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.
2016-01-23 19:51:49 +01:00
3c4e06c23f
ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.
...
We don't handle reflection textures during MTL import. This allowed a NULL
ptr to be used. Simply return in the case of a reflection texture.
2016-01-23 13:11:47 -04:00
rmitton
Kim Kulling
Kim Kulling
Sergei Nikulov
Turo Lamminen
Paul Holland
boxdot
abma
Andrew Parlane