Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,958 Commits 19 Branches 43 Tags
e7fa8fa8aec0aa7b784b3f90cfe5554ee5774a2f
Commit Graph

2958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
e7fa8fa8ae OpenDDLParser: add missing files. 2015-10-02 00:38:50 +02:00
Kim Kulling
4a8b459706 OpenDDLParser: latest greatest. 2015-10-01 20:29:15 +02:00
Kim Kulling
7ed32fd5a9 fix typo. 2015-09-27 20:49:15 +02:00
Kim Kulling
1fbc0cc276 DefaultIOSystem: fix typo in macro. 2015-09-27 10:51:33 +02:00
Kim Kulling
f5c8f7b5e5 DefaultIOSystem: close cygwin issue assimp/assimp/issues/660. 2015-09-27 01:02:12 +02:00
Kim Kulling
d06945f17e DefaultIOSystem: fix issue assimp/assimp/issues/660 by checking for _WIN32 
as well.
 2015-09-24 23:51:04 +02:00
Kim Kulling
3fc251b326 BaseImporter: fix typo and rename attributes for better readability. 2015-09-24 00:57:47 +02:00
Kim Kulling
ef6baa0acf DefaultIOSystem: use correct define to detect Visual Studi compiler. 2015-09-22 00:23:33 +02:00
Kim Kulling
34ee4c4b9a DefaultIOSystem close assimp/assimp/issues/108 : use correct macro to 
detect vs-compiler.
 2015-09-21 20:43:58 +02:00
Kim Kulling
6b1cac5743 Merge branch 'master' of https://github.com/assimp/assimp 2015-09-21 17:34:01 +02:00
Kim Kulling
ca6296f609 STLLoader: mak functions local. 2015-09-21 17:33:41 +02:00
Kim Kulling
f2c2bc6945 CMake: add windows 8.1 search path for DirectX SDK, closes 
assimp/assimp/issues/631
 2015-09-21 17:31:27 +02:00
Kim Kulling
e159728307 Update Readme.md 
Update contect info: now add an irc channel on freenode
 2015-09-15 08:55:40 +02:00
Kim Kulling
bd6a069fa8 Merge pull request #651 from abma/master 
fix #634, remove -fPIC for static builds / 32 bit
 2015-09-10 18:15:47 +02:00
Kim Kulling
ba37e362e8 Sample: fix https://github.com/assimp/assimp/issues/113, remove deprecated makefile. 2015-09-04 17:10:51 +02:00
abma
d49e47c25c fix #431 2015-09-02 10:10:30 +02:00
abma
fff2c4141e fix #634 2015-09-02 09:56:58 +02:00
Kim Kulling
e9937ab0f7 IOSystem: add missing documentation. 2015-08-30 15:37:56 +02:00
Kim Kulling
e4510c26ba Obj-Importer: fix https://github.com/assimp/assimp/issues/641 2015-08-30 15:21:53 +02:00
Kim Kulling
9708a4db93 Subdivision: fix compiler warning from debug check. 2015-08-30 13:48:00 +02:00
Alexander Gessler
305e27d1a5 Merge pull request #645 from l337r007/fix-osx-cmake 
CMake: Don't try to set property on target before it is defined.
 2015-08-29 14:58:53 +02:00
Alexander Gessler
ce5baa95ca Merge pull request #647 from Gargaj/patch-1 
add opencollada extension
 2015-08-29 14:58:27 +02:00
Alexander Gessler
ea45a9779e Merge pull request #648 from Gargaj/master 
Remove junk files
 2015-08-29 14:58:00 +02:00
Gargaj
1f6cead81b remove junk 2015-08-29 13:39:43 +02:00
Gargaj
9885c3e551 add opencollada extension 2015-08-28 16:20:17 +02:00
Wolfgang Herget
9f157ed9b8 CMake: Don't try to set property on target before it is defined. 
The exact same code this commit removes is repeated in line 748.
There, it actually works, since the "assimp" target is defined there.
 2015-08-26 12:36:57 +02:00
Kim Kulling
4afddf316f Merge pull request #632 from turol/afl-fixes 
Random crash fixes
 2015-08-14 16:13:54 +02:00
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