Commit Graph

  • 9708a4db93 Subdivision: fix compiler warning from debug check. Kim Kulling 2015-08-30 13:48:00 +02:00
  • 305e27d1a5 Merge pull request #645 from l337r007/fix-osx-cmake Alexander Gessler 2015-08-29 14:58:53 +02:00
  • ce5baa95ca Merge pull request #647 from Gargaj/patch-1 Alexander Gessler 2015-08-29 14:58:27 +02:00
  • ea45a9779e Merge pull request #648 from Gargaj/master Alexander Gessler 2015-08-29 14:58:00 +02:00
  • 1f6cead81b remove junk Gargaj 2015-08-29 13:39:43 +02:00
  • 9885c3e551 add opencollada extension Gargaj 2015-08-28 16:20:17 +02:00
  • 9f157ed9b8 CMake: Don't try to set property on target before it is defined. Wolfgang Herget 2015-08-26 12:36:57 +02:00
  • d74a1149b7 MD5: Fix quaternion conversions Jaakko Keränen 2015-08-18 11:36:32 +03:00
  • 4afddf316f Merge pull request #632 from turol/afl-fixes Kim Kulling 2015-08-14 16:13:54 +02:00
  • 91881065d7 Merge pull request #635 from turol/fix-bad-references Kim Kulling 2015-08-14 16:12:07 +02:00
  • 63959f716a Merge pull request #636 from heandreas/master Kim Kulling 2015-08-14 14:40:56 +02:00
  • ec43e08295 Fixed issue in STLLoader that lead to wrong node names. Andreas Henne 2015-08-14 13:37:41 +02:00
  • e67bcca744 IFC: Fix more bad references Turo Lamminen 2015-08-14 14:02:16 +03:00
  • 4540250116 IFC: Don't store temporary values by reference Turo Lamminen 2015-08-14 13:26:45 +03:00
  • 0b0ba2ec4d Refactor logic which checks for too large allocations Turo Lamminen 2015-08-13 13:01:49 +03:00
  • 5575a54466 Add various checks to avoid either too large or zero-sized memory allocations Turo Lamminen 2015-08-11 16:09:19 +03:00
  • e5ddb98dde STL: Fix another read past EOF Turo Lamminen 2015-08-11 15:53:16 +03:00
  • d185cea81c AC3D: Fix read past end of buffer Turo Lamminen 2015-08-11 15:44:51 +03:00
  • 4cc716a0f5 MDL: Fix read past end of buffer with malformed input Turo Lamminen 2015-08-11 14:32:26 +03:00
  • 2a432f9adc Merge pull request #633 from heandreas/master Kim Kulling 2015-08-13 15:13:09 +02:00
  • bcf3f985fb Fixed spelling error. Andreas Henne 2015-08-13 13:22:21 +02:00
  • 860360bd86 Fixed merge conflicts. Andreas Henne 2015-08-13 11:06:22 +02:00
  • 4cc67a3ccc Merge pull request #629 from turol/afl-fixes Kim Kulling 2015-08-10 16:53:58 +02:00
  • b39446b7bb Avoid reading past EOF when encountering a malformed STL file Turo Lamminen 2015-08-10 15:48:26 +03:00
  • 295a9abbdc Update CMakeLists.txt Kim Kulling 2015-08-10 13:13:01 +02:00
  • 524834c307 Fix line endings. Kim Kulling 2015-08-08 18:02:37 +02:00
  • 373f85ffaf Fix https://github.com/assimp/assimp/issues/620 Kim Kulling 2015-08-08 17:31:39 +02:00
  • a78e3708d2 CMake build: fix debug postfix, will now be d only for debug builds. Kim Kulling 2015-08-08 17:30:15 +02:00
  • 99e7b221be CMake build: fix typo in docu.! Kim Kulling 2015-08-08 17:24:06 +02:00
  • e5b61e5553 Python 3d_viewer: init glut manually for windows ( https://github.com/assimp/assimp/issues/622 ). Kim Kulling 2015-08-08 17:05:29 +02:00
  • 85c8d7b89b PyViewer: Add local path search path for ssimp lib. Kim Kulling 2015-08-08 17:04:46 +02:00
  • d8d64a8422 TLLoader: fix typo in comment. Kim Kulling 2015-08-08 11:57:15 +02:00
  • e794aaf017 STL-Loader: fix https://github.com/assimp/assimp/issues/103. Kim Kulling 2015-08-08 10:55:10 +02:00
  • 88746af2e6 Blender-Loader: fix issue https://github.com/assimp/assimp/issues/131. Kim Kulling 2015-08-07 21:22:09 +02:00
  • 23dba9fcf2 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2015-08-07 21:19:17 +02:00
  • 8836fd6b34 PLY-Loader: fix https://github.com/assimp/assimp/issues/160. Kim Kulling 2015-08-07 21:18:20 +02:00
  • 5b1d1ec9b3 Merge pull request #627 from turol/afl-fixes Alexander Gessler 2015-08-07 20:33:55 +02:00
  • 154760ab52 Abort early when hitting unexpected EOF in AC3D loader Turo Lamminen 2015-08-07 14:17:27 +03:00
  • 752961edfe Merge pull request #625 from turol/afl-fixes Kim Kulling 2015-08-06 17:41:09 +02:00
  • 128923a262 Fix out-of-bounds write on malformed input Turo Lamminen 2015-08-06 16:16:34 +03:00
  • 5030fe8c7e Formatting changes. Andreas Henne 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. Andreas Henne 2015-08-06 13:30:49 +02:00
  • 3fc56de33c Fixed merge conflicts. Andreas Henne 2015-08-06 12:04:05 +02:00
  • 49d6767551 Merge pull request #614 from bschwind/android-fix Alexander Gessler 2015-08-03 02:20:27 +02:00
  • 596c3bb4f9 Merge pull request #618 from triplepointfive/fix_normals Alexander Gessler 2015-08-03 02:17:35 +02:00
  • bb8d936246 Fix volume calculation Ilya Smelkov 2015-08-02 19:45:39 +03:00
  • a9a62368f8 Merge pull request #615 from delicious-monster/master Kim Kulling 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. Wil Shipley 2015-07-27 00:54:23 -07:00
  • 227a08d2b7 - These were Xcode's git control files and will vary from person to person. Wil Shipley 2015-07-26 19:50:32 -07:00
  • f7a8c80fc2 - Previous merge accidentally copied OpenDDL C++ files into include directory. Wil Shipley 2015-07-26 19:35:14 -07:00
  • 8b7fa48d27 - Merge in latest from assimp/assimp on GitHub (5c00aef7cd) Wil Shipley 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) Brian Schwind 2015-07-20 22:02:48 -04:00
  • 5c00aef7cd iOpenGEX: use std::string for grammar::token. Kim Kulling 2015-07-17 20:03:23 +02:00
  • 2dd393b800 Merge pull request #7 from assimp/master Madrich 2015-07-14 08:54:49 +02:00
  • f1a95d008b Update Readme.md Kim Kulling 2015-07-13 09:21:16 +02:00
  • 250623a5f3 Update Readme.md Kim Kulling 2015-07-13 09:20:17 +02:00
  • cceb5f4b9d Update Readme.md Kim Kulling 2015-07-13 09:06:05 +02:00
  • f498f3480c Update Readme.md Kim Kulling 2015-07-13 09:05:09 +02:00
  • 438fa80831 Update Readme.md Kim Kulling 2015-07-13 09:03:23 +02:00
  • c275db757a Windows CI: fix working directory. Kim Kulling 2015-07-13 00:40:17 +02:00
  • 0dca6acd84 Windows CI: add missing cmakefile reference to build script. Kim Kulling 2015-07-13 00:25:12 +02:00
  • cb3326b6fe Windows CI: debug texts. Kim Kulling 2015-07-12 20:35:30 +02:00
  • 4813120385 Windows CI: another one Kim Kulling 2015-07-12 20:10:56 +02:00
  • 1b02553e88 Windows CI: next try. Kim Kulling 2015-07-12 19:53:17 +02:00
  • 4c5b97c1b2 AppVeyor build: change folder before starting cmake run. Kim Kulling 2015-07-12 19:19:35 +02:00
  • 1cb55a3b80 CI: add prototype for appveyor. Kim Kulling 2015-07-12 18:07:01 +02:00
  • 5a207dbb19 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2015-07-10 01:21:57 +02:00
  • 14a849b398 Obj-loader: change include brackets. Kim Kulling 2015-07-10 01:21:10 +02:00
  • ca5ce8f476 Merge pull request #607 from assimp/feature/fix_issue_121 Kim Kulling 2015-07-09 22:26:45 +02:00
  • e138a02dd5 Obj: fix issue 121 - set group names as the mesh names. Kim Kulling 2015-07-09 20:15:44 +02:00
  • 891c17ee7b Obj: remove dead code. Kim Kulling 2015-07-09 19:59:47 +02:00
  • d162b213a2 Create .gitattributes Kim Kulling 2015-07-08 14:37:30 +02:00
  • 36f0ccced1 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2015-07-08 00:40:35 +02:00
  • bc8aa18eb2 Fix : https://github.com/assimp/assimp/issues/557 Kim Kulling 2015-07-08 00:34:28 +02:00
  • 4a77170399 Coverity finding: fix 2 more resource leaks. Kim Kulling 2015-07-06 20:47:45 +02:00
  • b0853cc485 Merge pull request #587 from rdb/master Alexander Gessler 2015-07-05 17:00:49 +02:00
  • 1eef4c387f Correct value for mColorAmbient for COLLADA files rdb 2015-07-05 14:30:27 +02:00
  • cf4cb6caef Merge pull request #598 from LegalizeAdulthood/cppcheck-null Alexander Gessler 2015-07-05 13:46:54 +02:00
  • 71b275eea2 Merge pull request #602 from ReliaSolve/mac_build_improvements Alexander Gessler 2015-07-05 13:16:34 +02:00
  • afc23827f3 Merge pull request #601 from ReliaSolve/windows_build_improvements Alexander Gessler 2015-07-05 13:15:58 +02:00
  • 2fd0a84c01 Merge pull request #603 from ReliaSolve/fix_compiler_warnings Alexander Gessler 2015-07-05 13:15:12 +02:00
  • f618387b06 Added const to string definitions so that the compiler won't warn about them being unused. Russ Taylor 2015-07-04 18:31:25 -04:00
  • c09eb045a1 Explicit conversion of a quantity that should be positive to unsigned to avoid compiler warning. Russ Taylor 2015-07-04 18:08:31 -04:00
  • 65374b085d Removing another test that cannot fail. Russ Taylor 2015-07-04 17:49:15 -04:00
  • d5d0ceedae Removing checks for impossible things. The code comments said that we should not be able to get to this case, but if fact we cannot get to the case. Russ Taylor 2015-07-04 17:46:59 -04:00
  • 386ff96530 Knows where to look for glut.h on Mac with Clang compilers (command-line compilers under current XCode). Russ Taylor 2015-07-04 16:27:00 -04:00
  • 8d07cfe1f3 Does not try and find the math library under Visual Studio compilers, where it is not needed. Russ Taylor 2015-07-04 16:08:56 -04:00
  • 9474bbc8e9 Checks for DirectX. If it is not found, does not pull in the assimp_view project that needs it. Russ Taylor 2015-07-04 16:08:26 -04:00
  • 931cb7da71 Merge pull request #599 from LegalizeAdulthood/cppcheck-printf Kim Kulling 2015-07-04 09:51:04 +02:00
  • bd0b58d906 Merge pull request #600 from LegalizeAdulthood/cppcheck-format-operator Kim Kulling 2015-07-04 09:29:47 +02:00
  • 68f88752b3 Build: fix missing commas. Kim Kulling 2015-07-04 09:22:11 +02:00
  • 0faf53af0b Refactor: Prefer Format::operator<< over Format::operator, Richard 2015-07-03 20:13:00 -06:00
  • dd609767f2 Fixed: Use proper printf format specifier for unsigned integers Richard 2015-07-02 05:27:12 -06:00
  • b6cf553ff5 Fixed: Use correct printf format specifier for unsigned integers Richard 2015-07-02 05:50:04 -06:00
  • e3ebef0094 Fixed: Correct null pointer dereference Richard 2015-07-02 05:50:21 -06:00
  • 8d82bf3338 Fixed: Ensure string buffers are NUL terminated. Richard 2015-07-02 05:09:38 -06:00
  • 05524726c8 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2015-07-03 20:40:19 +02:00
  • dff3476e50 Line endings. Kim Kulling 2015-07-03 20:40:07 +02:00
  • 3af8014055 INcreas readability. Kim Kulling 2015-07-03 19:00:21 +02:00
  • 001eef2a9f Coverify: fix resource leak. Kim Kulling 2015-07-03 18:58:02 +02:00