Commit Graph

  • a96587d551 applied coding conventions added check against the known faces CwTCwT 2018-06-16 15:30:22 +02:00
  • 41bf572af6 issue_2016 only add material uv mappings if set, ignore when no uvmapping set removed unneccessary pad_i1 field (to prevent unnecessary field read exceptions) CwTCwT 2018-06-16 15:08:19 +02:00
  • 34e63dbe09 Merge branch 'master' into hide_gpg_signature Kim Kulling 2018-06-16 15:01:17 +02:00
  • 31adc4385c Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2018-06-16 14:59:15 +02:00
  • aa09001333 Merge pull request #1990 from assimp/review Kim Kulling 2018-06-16 12:11:26 +02:00
  • d416fe874e Update XFileParser.cpp Kim Kulling 2018-06-16 10:32:43 +02:00
  • 8334bb579c Hide commit signature information when fetching commit hash Pierre Moreau 2018-06-16 09:29:18 +02:00
  • 3e45acbf4e Merge branch 'master' into review Kim Kulling 2018-06-16 09:10:41 +02:00
  • a03ab068be Update XFileParser.cpp Kim Kulling 2018-06-16 09:10:30 +02:00
  • e3bfd08445 Merge pull request #2013 from cloudwu/fixbuild Kim Kulling 2018-06-16 09:07:55 +02:00
  • e29437ff3b Merge branch 'master' into fixbuild Kim Kulling 2018-06-15 20:40:06 +02:00
  • 878b4b2c18 Merge pull request #2018 from maxvollmer/master Kim Kulling 2018-06-15 20:39:53 +02:00
  • 0b02b92701 Some FBX files have Null/LimbNode attributes with an empty Properties70 element, where the Element is not NULL, but it's Compound is. The code only checked if the Element itself is NULL, thus causing a DeadlyImportError when trying to instantiate a PropertyTable for an Element that doesn't have a Compound. Max Vollmer 2018-06-15 15:46:38 +02:00
  • 946ce97eee Merge pull request #1 from assimp/master Max Vollmer 2018-06-15 15:42:51 +02:00
  • 1d5b1b12e2 Merge branch 'master' into ios-build-script Doron Adler 2018-06-14 14:55:02 +03:00
  • 651d9c8ea1 Merge branch 'master' into fixbuild Kim Kulling 2018-06-13 22:08:02 +02:00
  • 490a2e4b08 Merge pull request #2012 from assimp/kimkulling-build-ios-doc Kim Kulling 2018-06-13 22:07:04 +02:00
  • 0a1c04e94e Merge branch 'master' into fixbuild 云风 2018-06-13 15:01:24 +08:00
  • 2188703f55 fix build for independent build dir Cloud Wu 2018-06-13 10:46:30 +08:00
  • 6a1c90db41 Merge branch 'master' into kimkulling-build-ios-doc Kim Kulling 2018-06-12 23:16:15 +02:00
  • 470f3a47f0 Merge pull request #1996 from viscom-ulm/master Kim Kulling 2018-06-12 23:16:04 +02:00
  • a8236f2986 Merge branch 'master' into master Kim Kulling 2018-06-12 22:10:54 +02:00
  • 83651e382d Update INSTALL for iOS build Kim Kulling 2018-06-12 21:52:53 +02:00
  • 80cf028629 Merge pull request #1991 from microm8/master Kim Kulling 2018-06-12 13:29:54 +02:00
  • 5f3aa142b4 Merge branch 'master' into master Kim Kulling 2018-06-12 11:40:40 +02:00
  • c659d682ae Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2018-06-11 20:35:54 +02:00
  • 5fedba3300 Merge pull request #2005 from CwTCwT/master Kim Kulling 2018-06-11 20:08:32 +02:00
  • 155719cb6c Merge branch 'master' into master Kim Kulling 2018-06-11 19:05:28 +02:00
  • 1292fb0983 Merge pull request #2007 from Calinou/improve-contributing-guide Kim Kulling 2018-06-11 19:00:50 +02:00
  • 5f04cf09e7 Improve the contribution guide Hugo Locurcio 2018-06-10 19:10:18 +02:00
  • 9415380b4c usage of dynamic_cast instead of static_cast CwTCwT 2018-06-10 10:35:15 +02:00
  • 7db668e66f prevent zero sized array allocations CwTCwT 2018-06-09 23:36:42 +02:00
  • 959c0e8907 reworked to ElemBase * CwTCwT 2018-06-09 23:29:50 +02:00
  • 5b4b16f360 use of malloc and free (given to shared ptr) for correct mem management CwTCwT 2018-06-09 21:25:59 +02:00
  • 9d2a1ca047 rereworked suggested by clang CwTCwT 2018-06-09 21:12:05 +02:00
  • 19fade2164 travis changes according clang 5.0 CwTCwT 2018-06-09 20:57:32 +02:00
  • 09825d8d03 again travis hit me CwTCwT 2018-06-09 20:42:02 +02:00
  • 96bc2d3146 changes according travis compiles CwTCwT 2018-06-09 20:22:59 +02:00
  • 2c2b76a2bb changes according travis build CwTCwT 2018-06-09 16:47:05 +02:00
  • b8facc5dae changed to coding convention CwTCwT 2018-06-09 15:56:26 +02:00
  • 85b0026c92 issue_1973 added support for CustomData(Layer) to support multiple (texture) UV mappings added unittest with sample model CwTCwT 2018-06-09 15:45:09 +02:00
  • cd0fe21464 Merge pull request #1954 from assimp/make_tools Kim Kulling 2018-06-06 13:03:30 +02:00
  • e07aedac9e Update script.iss Kim Kulling 2018-06-06 10:39:17 +02:00
  • de088328aa replace typo by comment statement. kimkulling 2018-06-05 11:27:24 +02:00
  • c313d5a3e9 Update script.iss Kim Kulling 2018-06-05 10:55:51 +02:00
  • d55525d16b Update script.iss Kim Kulling 2018-06-05 10:25:35 +02:00
  • 12438bcdb2 Update script.iss Kim Kulling 2018-06-04 22:37:05 +02:00
  • ab301c1acc Update script.iss Kim Kulling 2018-06-04 22:08:20 +02:00
  • c46008055c Update script.iss Kim Kulling 2018-06-04 21:41:58 +02:00
  • 37ed614b70 Update appveyor.yml Kim Kulling 2018-06-04 15:02:37 +02:00
  • 20bfb3662f Update script.iss Kim Kulling 2018-06-04 11:53:44 +02:00
  • fbdb4b17fd Merge branch 'force_generate_normals' Sebastian Maisch 2018-06-04 10:51:12 +02:00
  • a2a7877939 Merge branch 'master' into make_tools Kim Kulling 2018-06-04 09:12:11 +02:00
  • 24d49b0cc7 Update appveyor.yml Kim Kulling 2018-06-04 09:01:17 +02:00
  • 87315883b5 Merge branch 'master' into master microm8 2018-06-04 08:17:50 +02:00
  • 90549e9680 Update script.iss Kim Kulling 2018-06-03 21:29:23 +02:00
  • 5f820fb6d6 Update appveyor.yml Kim Kulling 2018-06-03 17:21:46 +02:00
  • d86a0e3adb Merge branch 'master' into ios-build-script Doron Adler 2018-06-03 14:25:36 +03:00
  • 29e269ff95 Merge pull request #1989 from assimp/kimkulling-net-doc Kim Kulling 2018-06-03 01:35:12 +02:00
  • d112095a83 Merge branch 'master' into kimkulling-net-doc Kim Kulling 2018-06-03 00:54:56 +02:00
  • 42b1ea0d65 Merge pull request #1992 from turol/strict-aliasing Turo Lamminen 2018-06-01 23:23:25 +03:00
  • f15dcf7663 Added forced generation of normals with extra flag. Sebastian Maisch 2018-06-01 17:32:02 +02:00
  • 9064c983ad Merge branch 'master' into master microm8 2018-06-01 13:42:35 +02:00
  • b0b6048502 LWOMaterial: Fix strict aliasing violations Turo Lamminen 2018-06-01 12:37:21 +03:00
  • 6788d7b18b 3DS: Fix strict aliasing violations Turo Lamminen 2018-06-01 12:28:33 +03:00
  • bbb60c29f0 Fix strict aliasing violation in MaterialSystem Turo Lamminen 2018-06-01 12:20:16 +03:00
  • 6aa32b41a1 Replace type punning with explicit memcpys Turo Lamminen 2018-06-01 12:05:42 +03:00
  • 4af69dbeb9 undo .gitignore Michael Roer Pedersen 2018-06-01 09:33:28 +02:00
  • b176513efa FBX export. to_ktime ticks was ok. Michael Roer Pedersen 2018-06-01 09:24:53 +02:00
  • bcf8a90b8b Merge branch 'master' into kimkulling-net-doc Kim Kulling 2018-05-31 21:39:18 +02:00
  • fd2a71b3fd Merge pull request #1988 from kebby/master Kim Kulling 2018-05-31 21:38:57 +02:00
  • 31e75b9d54 Update FBXConverter.cpp Kim Kulling 2018-05-31 20:18:17 +02:00
  • 339cc2e951 Some review findings. Kim Kulling 2018-05-31 20:15:13 +02:00
  • 64ba839f47 Update Readme.md Kim Kulling 2018-05-31 20:04:48 +02:00
  • fceeaa72f4 FBX animation export: Assimp animation time is already in seconds. Just convert to FBX time. Michael Roer Pedersen 2018-05-31 15:07:00 +02:00
  • ffb6756d2a FBX: LayeredTextures now work with embedded texture data Tammo Hinrichs 2018-05-30 14:56:53 +02:00
  • dd0d602681 Merge pull request #1985 from severin-lemaignan/master Kim Kulling 2018-05-30 11:10:09 +02:00
  • 2b18903f12 Merge branch 'master' into master Kim Kulling 2018-05-30 10:36:21 +02:00
  • 948e915a4c Merge pull request #1980 from gstanlo/master Kim Kulling 2018-05-30 09:19:04 +02:00
  • 6e49d288c3 now only x86_64 builds :( Doron Adler 2018-05-30 09:40:18 +03:00
  • e3847b7996 Default to release builds, update CC/LD/etc flags Doron Adler 2018-05-30 09:21:28 +03:00
  • 1ee9200277 smallerMax Doron Adler 2018-05-30 08:49:11 +03:00
  • 1883d44b9b Merge branch 'master' into master Kim Kulling 2018-05-29 19:02:40 +02:00
  • c6eda67296 Changed assimp to force regeneration of normals. Sebastian Maisch 2018-05-29 13:01:11 +02:00
  • c12c56d33e [pyassimp] README.{md->rst} to please distutils. Bumped to 4.1.3 Séverin Lemaignan 2018-05-29 10:47:40 +01:00
  • b6888962ed [pyassimp] Updated setup.py Séverin Lemaignan 2018-05-28 23:53:28 +01:00
  • bbe9973425 Merge pull request #1979 from TinyTinni/fix-vector-out-of-bound-access Kim Kulling 2018-05-28 22:26:06 +02:00
  • 3023df8f7e Norod: Configurable from script parameters: dynamic libraries and debug/release build type Doron Adler 2018-05-28 17:36:43 +03:00
  • 27b989fd36 Merge branch 'master' into ios-build-script Doron Adler 2018-05-28 16:27:00 +03:00
  • 323d59c7aa Check for null Doron Adler 2018-05-28 16:12:54 +03:00
  • bf7ec7d130 Merge branch 'master' into fix-vector-out-of-bound-access Kim Kulling 2018-05-26 13:25:57 +02:00
  • 48100d0016 Merge pull request #1981 from smalcom/qt_assimp_viewer Kim Kulling 2018-05-26 11:04:30 +02:00
  • aa18e8a2a5 Update Importer.cpp Kim Kulling 2018-05-25 21:43:39 +02:00
  • f29af1abc0 [-] Trace print removed. smalcom 2018-05-25 21:31:22 +03:00
  • 02d2b6e0d8 [F] Get return "like true" when error occured. smalcom 2018-05-25 21:30:59 +03:00
  • 5b23492421 Merge branch 'master' into qt_assimp_viewer smalcom 2018-05-25 21:20:03 +03:00
  • 67eff10d8f [*] qt_assimp_viewer can be built with Qt4 or Qt5. [F] Working in doule precision. smalcom 2018-05-25 21:19:06 +03:00
  • d72ff712cb [F] List of importers can be empty. smalcom 2018-05-25 21:16:08 +03:00
  • 97cecc858a Properly reads in glTF/2.0 sampler address modes. gstanlo 2018-05-24 17:25:26 -07:00
  • f59ab5c34f [F] More correct control by a mouse smalcom 2018-05-24 17:11:21 +03:00