e5b61e5553
Python 3d_viewer: init glut manually for windows ( https://github.com/assimp/assimp/issues/622 ).
2015-08-08 17:05:29 +02:00
85c8d7b89b
PyViewer: Add local path search path for ssimp lib.
2015-08-08 17:04:46 +02:00
d8d64a8422
TLLoader: fix typo in comment.
2015-08-08 11:57:15 +02:00
e794aaf017
STL-Loader: fix https://github.com/assimp/assimp/issues/103 .
2015-08-08 10:55:10 +02:00
88746af2e6
Blender-Loader: fix issue https://github.com/assimp/assimp/issues/131 .
2015-08-07 21:22:09 +02:00
23dba9fcf2
Merge branch 'master' of https://github.com/assimp/assimp
2015-08-07 21:19:17 +02:00
8836fd6b34
PLY-Loader: fix https://github.com/assimp/assimp/issues/160 .
2015-08-07 21:18:20 +02:00
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
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
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
128923a262
Fix out-of-bounds write on malformed input
2015-08-06 16:16:34 +03:00
5030fe8c7e
Formatting changes.
2015-08-06 13:37:16 +02:00
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
3fc56de33c
Fixed merge conflicts.
2015-08-06 12:04:05 +02:00
49d6767551
Merge pull request #614 from bschwind/android-fix
...
Include correct headers, fix string length bug
2015-08-03 02:20:27 +02:00
596c3bb4f9
Merge pull request #618 from triplepointfive/fix_normals
...
Fix volume calculation
2015-08-03 02:17:35 +02:00
bb8d936246
Fix volume calculation
2015-08-02 19:45:39 +03:00
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
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
227a08d2b7
- These were Xcode's git control files and will vary from person to person.
2015-07-26 19:50:32 -07:00
f7a8c80fc2
- Previous merge accidentally copied OpenDDL C++ files into include directory.
2015-07-26 19:35:14 -07:00
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
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
5c00aef7cd
iOpenGEX: use std::string for grammar::token.
2015-07-17 20:03:23 +02:00
f1a95d008b
Update Readme.md
...
Add OpenGEX-format as one format which is ofically supported.
2015-07-13 09:21:16 +02:00
250623a5f3
Update Readme.md
...
Remove deprecated note.
2015-07-13 09:20:17 +02:00
cceb5f4b9d
Update Readme.md
...
Reformat
2015-07-13 09:06:05 +02:00
f498f3480c
Update Readme.md
...
Fix usage of build badge for appveyor
2015-07-13 09:05:09 +02:00
438fa80831
Update Readme.md
...
Add win32-build status to README.md
2015-07-13 09:03:23 +02:00
c275db757a
Windows CI: fix working directory.
2015-07-13 00:40:17 +02:00
0dca6acd84
Windows CI: add missing cmakefile reference to build script.
2015-07-13 00:25:12 +02:00
cb3326b6fe
Windows CI: debug texts.
2015-07-12 20:35:30 +02:00
4813120385
Windows CI: another one
2015-07-12 20:10:56 +02:00
1b02553e88
Windows CI: next try.
2015-07-12 19:53:17 +02:00
4c5b97c1b2
AppVeyor build: change folder before starting cmake run.
2015-07-12 19:19:35 +02:00
1cb55a3b80
CI: add prototype for appveyor.
2015-07-12 18:07:01 +02:00
5a207dbb19
Merge branch 'master' of https://github.com/assimp/assimp
2015-07-10 01:21:57 +02:00
14a849b398
Obj-loader: change include brackets.
2015-07-10 01:21:10 +02:00
ca5ce8f476
Merge pull request #607 from assimp/feature/fix_issue_121
...
Obj: fix issue 121 - set group names as the mesh names.
2015-07-09 22:26:45 +02:00
e138a02dd5
Obj: fix issue 121 - set group names as the mesh names.
2015-07-09 20:15:44 +02:00
891c17ee7b
Obj: remove dead code.
2015-07-09 19:59:47 +02:00
d162b213a2
Create .gitattributes
2015-07-08 14:37:30 +02:00
36f0ccced1
Merge branch 'master' of https://github.com/assimp/assimp
...
Conflicts:
tools/assimp_cmd/ImageExtractor.cpp
2015-07-08 00:40:35 +02:00
bc8aa18eb2
Fix : https://github.com/assimp/assimp/issues/557
2015-07-08 00:34:28 +02:00
4a77170399
Coverity finding: fix 2 more resource leaks.
2015-07-06 20:47:45 +02:00
b0853cc485
Merge pull request #587 from rdb/master
...
Correct value for mColorAmbient for COLLADA files
2015-07-05 17:00:49 +02:00
1eef4c387f
Correct value for mColorAmbient for COLLADA files
2015-07-05 14:30:27 +02:00
cf4cb6caef
Merge pull request #598 from LegalizeAdulthood/cppcheck-null
...
Fix char buffer issues found by cppcheck
2015-07-05 13:46:54 +02:00
71b275eea2
Merge pull request #602 from ReliaSolve/mac_build_improvements
...
Builds out of the box on mac with ASSIMP_BUILD_SAMPLES turned on.
2015-07-05 13:16:34 +02:00
afc23827f3
Merge pull request #601 from ReliaSolve/windows_build_improvements
...
Windows build improvements
2015-07-05 13:15:58 +02:00
Kim Kulling
Alexander Gessler
Turo Lamminen
Kim Kulling
Andreas Henne
Ilya Smelkov
Wil Shipley
Brian Schwind
rdb