Kim Kulling
91881065d7
Merge pull request #635 from turol/fix-bad-references
...
IFC: Don't store temporary values by reference
2015-08-14 16:12:07 +02:00
Kim Kulling
63959f716a
Merge pull request #636 from heandreas/master
...
Fixed issue in STLLoader that lead to wrong node names.
2015-08-14 14:40:56 +02:00
Andreas Henne
ec43e08295
Fixed issue in STLLoader that lead to wrong node names.
2015-08-14 13:37:41 +02:00
Turo Lamminen
e67bcca744
IFC: Fix more bad references
2015-08-14 14:02:16 +03:00
Turo Lamminen
4540250116
IFC: Don't store temporary values by reference
...
This is not legal in any way and should never have worked.
2015-08-14 13:32:45 +03:00
Turo Lamminen
0b0ba2ec4d
Refactor logic which checks for too large allocations
...
It's now easier to change the limit
2015-08-14 11:53:16 +03:00
Turo Lamminen
5575a54466
Add various checks to avoid either too large or zero-sized memory allocations
2015-08-14 11:53:16 +03:00
Turo Lamminen
e5ddb98dde
STL: Fix another read past EOF
2015-08-14 11:53:13 +03:00
Turo Lamminen
d185cea81c
AC3D: Fix read past end of buffer
2015-08-14 11:37:00 +03:00
Turo Lamminen
4cc716a0f5
MDL: Fix read past end of buffer with malformed input
2015-08-14 11:37:00 +03:00
Kim Kulling
2a432f9adc
Merge pull request #633 from heandreas/master
...
Multiple meshes in single STL ascii file and binary bly exporter fix
2015-08-13 15:13:09 +02:00
Andreas Henne
bcf3f985fb
Fixed spelling error.
2015-08-13 13:22:21 +02:00
Andreas Henne
860360bd86
Fixed merge conflicts.
2015-08-13 11:06:22 +02:00
Kim Kulling
4cc67a3ccc
Merge pull request #629 from turol/afl-fixes
...
Avoid reading past EOF when encountering a malformed STL file
2015-08-10 16:53:58 +02:00
Turo Lamminen
b39446b7bb
Avoid reading past EOF when encountering a malformed STL file
...
Since IsSpaceOrNewLine returns true on '\0' we might try to read past
end of buffer on line 310. Add explicit check to avoid this.
2015-08-10 15:50:05 +03:00
Kim Kulling
295a9abbdc
Update CMakeLists.txt
...
Fix for https://github.com/assimp/assimp/issues/166
2015-08-10 13:13:01 +02:00
Kim Kulling
524834c307
Fix line endings.
2015-08-08 18:02:37 +02:00
Kim Kulling
373f85ffaf
Fix https://github.com/assimp/assimp/issues/620
2015-08-08 17:31:39 +02:00
Kim Kulling
a78e3708d2
CMake build: fix debug postfix, will now be d only for debug builds.
2015-08-08 17:30:15 +02:00
Kim Kulling
99e7b221be
CMake build: fix typo in docu.!
2015-08-08 17:24:06 +02:00
Kim Kulling
e5b61e5553
Python 3d_viewer: init glut manually for windows ( https://github.com/assimp/assimp/issues/622 ).
2015-08-08 17:05:29 +02:00
Kim Kulling
85c8d7b89b
PyViewer: Add local path search path for ssimp lib.
2015-08-08 17:04:46 +02:00
Kim Kulling
d8d64a8422
TLLoader: fix typo in comment.
2015-08-08 11:57:15 +02:00
Kim Kulling
e794aaf017
STL-Loader: fix https://github.com/assimp/assimp/issues/103 .
2015-08-08 10:55:10 +02:00
Kim Kulling
88746af2e6
Blender-Loader: fix issue https://github.com/assimp/assimp/issues/131 .
2015-08-07 21:22:09 +02:00
Kim Kulling
23dba9fcf2
Merge branch 'master' of https://github.com/assimp/assimp
2015-08-07 21:19:17 +02:00
Kim Kulling
8836fd6b34
PLY-Loader: fix https://github.com/assimp/assimp/issues/160 .
2015-08-07 21:18:20 +02:00
Alexander Gessler
5b1d1ec9b3
Merge pull request #627 from turol/afl-fixes
...
Abort early when hitting unexpected EOF in AC3D loader
2015-08-07 20:33:55 +02:00
Turo Lamminen
154760ab52
Abort early when hitting unexpected EOF in AC3D loader
...
Without this the code will try to loop through the specified number
of surfaces which could be very large even though none will succeed.
2015-08-07 14:18:16 +03:00
Kim Kulling
752961edfe
Merge pull request #625 from turol/afl-fixes
...
Fix out-of-bounds write on malformed input
2015-08-06 17:41:09 +02:00
Turo Lamminen
128923a262
Fix out-of-bounds write on malformed input
2015-08-06 16:16:34 +03:00
Andreas Henne
5030fe8c7e
Formatting changes.
2015-08-06 13:37:16 +02:00
Andreas Henne
fb9e4d1266
Ply export now uses uchar as type for the number of vertices per polygon and int as vertex index type.
2015-08-06 13:30:49 +02:00
Andreas Henne
3fc56de33c
Fixed merge conflicts.
2015-08-06 12:04:05 +02:00
Alexander Gessler
49d6767551
Merge pull request #614 from bschwind/android-fix
...
Include correct headers, fix string length bug
2015-08-03 02:20:27 +02:00
Alexander Gessler
596c3bb4f9
Merge pull request #618 from triplepointfive/fix_normals
...
Fix volume calculation
2015-08-03 02:17:35 +02:00
Ilya Smelkov
bb8d936246
Fix volume calculation
2015-08-02 19:45:39 +03:00
Kim Kulling
a9a62368f8
Merge pull request #615 from delicious-monster/master
...
I made changes to the Collada importer so it will import SketchUp DAEs.
2015-07-27 20:25:20 +02:00
Wil Shipley
7a7a496320
- Add include of stdarg, because apparently that's needed to build of Github server with Travis.
2015-07-27 00:54:23 -07:00
Wil Shipley
227a08d2b7
- These were Xcode's git control files and will vary from person to person.
2015-07-26 19:50:32 -07:00
Wil Shipley
f7a8c80fc2
- Previous merge accidentally copied OpenDDL C++ files into include directory.
2015-07-26 19:35:14 -07:00
Wil Shipley
8b7fa48d27
- Merge in latest from assimp/assimp on GitHub ( 5c00aef7cd
)
...
- Added at least some of the new files to my Xcode 6 project, as
well.
- Built and tested with the DAE importer, seems to work fine.
2015-07-26 19:16:01 -07:00
Brian Schwind
bcb0ca3efa
Include correct headers, fix string length bug
...
- AssimpPCH.h appears to have been removed in #536
- There was a bug where if your model data had a null terminator, AndroidJNIIOSystem would incorrectly calculate the number of bytes it needed to write to the file (since it reads a compressed file from the Android assets, and then writes it to the internalDataPath directory for later importing)
2015-07-20 22:21:17 -04:00
Kim Kulling
5c00aef7cd
iOpenGEX: use std::string for grammar::token.
2015-07-17 20:03:23 +02:00
Kim Kulling
f1a95d008b
Update Readme.md
...
Add OpenGEX-format as one format which is ofically supported.
2015-07-13 09:21:16 +02:00
Kim Kulling
250623a5f3
Update Readme.md
...
Remove deprecated note.
2015-07-13 09:20:17 +02:00
Kim Kulling
cceb5f4b9d
Update Readme.md
...
Reformat
2015-07-13 09:06:05 +02:00
Kim Kulling
f498f3480c
Update Readme.md
...
Fix usage of build badge for appveyor
2015-07-13 09:05:09 +02:00
Kim Kulling
438fa80831
Update Readme.md
...
Add win32-build status to README.md
2015-07-13 09:03:23 +02:00
Kim Kulling
c275db757a
Windows CI: fix working directory.
2015-07-13 00:40:17 +02:00