Commit Graph

  • 524d8c281e Merge pull request #2460 from jackoalan/windows-external-zlib-fix Kim Kulling 2019-05-14 23:59:07 +02:00
  • 785ceaf58a Merge branch 'master' into windows-external-zlib-fix Kim Kulling 2019-05-14 22:07:56 +02:00
  • f50a0f0648 Merge branch 'master' into pr/7 Rich ard 2019-05-14 13:20:27 -05:00
  • add086b9e8 Merge pull request #2427 from RichardTea/assimpview_unicode Kim Kulling 2019-05-14 18:59:58 +02:00
  • 747a7c963b Merge branch 'master' into assimpview_unicode Kim Kulling 2019-05-13 23:49:06 +02:00
  • 5bee5307e4 Merge pull request #2461 from assimp/issue_2459 Kim Kulling 2019-05-13 23:48:42 +02:00
  • 815730c92d Update CMakeLists.txt Kim Kulling 2019-05-13 21:49:50 +02:00
  • adbdbf2be6 closes https://github.com/assimp/assimp/issues/2459: fix duplicated fbx-type propertry. Kim Kulling 2019-05-13 21:41:37 +02:00
  • 461e21f66d Fix Windows build with external zlib Jack Andersen 2019-05-12 10:56:59 -10:00
  • cb0c47764a Set directory and name properties for installing static lib PDB Jack Andersen 2019-05-11 11:56:28 -10:00
  • c48adf2301 Merge pull request #2455 from assimp/issue_2335 Kim Kulling 2019-05-11 20:43:02 +02:00
  • fd0e0d05e6 Inno: fix ArchitecturesInstallIn64BitMode for x86 platforms. Kim Kulling 2019-05-11 13:02:07 +02:00
  • 0898484d45 Inno: fix folder names + versions. Kim Kulling 2019-05-11 11:02:28 +02:00
  • 6aecfd0183 closes https://github.com/assimp/assimp/issues/2334: run vc_redist in passive + quiet mode. Kim Kulling 2019-05-11 09:39:23 +02:00
  • 64ff361610 closes https://github.com/assimp/assimp/issues/2335: add cmake-modules to the installer. Kim Kulling 2019-05-11 09:19:43 +02:00
  • 4f7de109a1 Merge branch 'master' into assimpview_unicode Kim Kulling 2019-05-10 18:52:32 +02:00
  • 2582ae53ee Merge pull request #2450 from mlavik1/fbxexport_crashfix Kim Kulling 2019-05-10 18:51:57 +02:00
  • 741be6f9db Merge branch 'master' into fbxexport_crashfix Kim Kulling 2019-05-10 15:32:18 +02:00
  • f81b90a469 Merge pull request #2451 from mlavik1/fbxexporter_embedded_textures Kim Kulling 2019-05-10 15:30:57 +02:00
  • 700954c115 Update FBXExporter.cpp Kim Kulling 2019-05-10 09:09:47 +02:00
  • a443544986 Replaced binary literals with hex literals (since binary literals was introduced in C++14) Matias 2019-05-09 15:28:00 +02:00
  • 9903504c42 Removed some code that I didn't mean to fix (I already submitted this in another PR: https://github.com/assimp/assimp/pull/2450). Matias 2019-05-09 14:57:18 +02:00
  • 575ef4d927 Added support for embedded textures to the FBXExporter (both binary and ASCII). Also made the FBX-namespaces more consistent (we had both Assimp::FBX:: and FBX::). Since we seem to support two types of embedded texture references (both asterisk+texture_id and filepath) I made the exporter use aiScene::GetEmbeddedTexture for looking up texture reference and integrated @loebl 's modification of the function to support the old ("*1") type of references (https://github.com/loebl/assimp/commit/e217358) Matias 2019-05-09 14:50:22 +02:00
  • 6736f3d24b Don't call PutString with an empty string. Both DumpChildrenAscii and EndAscii can return without modifyting the string, so we need to check the string before calling PutString. This used to cause a crash. Matias 2019-05-09 11:19:05 +02:00
  • 9430696048 Merge pull request #2433 from hshakula/gltf2-import-animation-name Kim Kulling 2019-05-08 08:41:41 +02:00
  • 56b82e9cd5 Merge branch 'master' into gltf2-import-animation-name Kim Kulling 2019-05-07 21:43:29 +02:00
  • 880e5ee32c Merge pull request #2448 from assimp/fbx_convert_to_unit Kim Kulling 2019-05-07 21:43:08 +02:00
  • e1a0861556 Merge branch 'fbx_convert_to_unit' of https://github.com/assimp/assimp into fbx_convert_to_unit Kim Kulling 2019-05-07 20:33:42 +02:00
  • 390452bd06 Fix the build. Kim Kulling 2019-05-07 20:32:45 +02:00
  • 66a840d9e6 Merge branch 'master' into fbx_convert_to_unit Kim Kulling 2019-05-07 15:26:52 +02:00
  • 9501483367 Merge pull request #2438 from b1skit/master Kim Kulling 2019-05-07 15:26:26 +02:00
  • 22b01ca3e8 Merge branch 'master' into master Kim Kulling 2019-05-07 09:55:43 +02:00
  • 1517bfcb9f Merge pull request #2447 from assimp/issue_2054 Kim Kulling 2019-05-07 09:55:28 +02:00
  • e917b288a1 fix a typo. Kim Kulling 2019-05-06 21:38:45 +02:00
  • 4155f005be Add implementation to convert from cm to m. Kim Kulling 2019-05-06 21:21:58 +02:00
  • 4a9cd08451 Prepaation for conversion. Kim Kulling 2019-05-06 20:51:04 +02:00
  • e611ccc933 Merge branch 'issue_2054' of https://github.com/assimp/assimp into issue_2054 Kim Kulling 2019-05-06 19:15:35 +02:00
  • 02324123e5 Fix typo in comment. Kim Kulling 2019-05-06 19:15:28 +02:00
  • e6b4a21be1 Merge branch 'master' into issue_2054 Kim Kulling 2019-05-06 18:47:14 +02:00
  • 1203d4658c Add missing doc. Kim Kulling 2019-05-06 18:44:30 +02:00
  • 990dc9453e Merge pull request #14 from assimp/master Madrich 2019-05-06 12:11:40 +02:00
  • 34084423ca Merge pull request #2446 from assimp/issue_2054 Kim Kulling 2019-05-05 22:20:41 +02:00
  • e403aaa0cc Merge branch 'issue_2054' of https://github.com/assimp/assimp into issue_2054 Kim Kulling 2019-05-05 19:27:40 +02:00
  • eb1a2586c3 add missing define in config.h.in Kim Kulling 2019-05-05 17:44:15 +02:00
  • df2a279895 Merge branch 'master' into issue_2054 Kim Kulling 2019-05-05 16:28:39 +02:00
  • e1fce7819c Merge pull request #2435 from ov/bad-obj-file Kim Kulling 2019-05-05 16:28:18 +02:00
  • 9147fb8689 Merge branch 'issue_2054' of https://github.com/assimp/assimp into issue_2054 Kim Kulling 2019-05-05 16:24:05 +02:00
  • 1324409c7b fix build: fix wrong function prototype. Kim Kulling 2019-05-05 16:23:42 +02:00
  • 8c18c42afb Merge branch 'master' into issue_2054 Kim Kulling 2019-05-05 16:16:45 +02:00
  • 69ece762d1 fix the build: remove errorenous pragma statement. Kim Kulling 2019-05-05 16:00:57 +02:00
  • fcff12b219 closes https://github.com/assimp/assimp/issues/2054: make empty bone validation optional. Kim Kulling 2019-05-05 13:39:10 +02:00
  • 9b9f7b2876 Merge branch 'master' into bad-obj-file Kim Kulling 2019-05-04 21:17:15 +02:00
  • 4a6b9d716a Merge pull request #2430 from Hugo-Pereira/fix_assimp_export_consistency Kim Kulling 2019-05-04 21:16:34 +02:00
  • 34ede5608b Merge branch 'master' into fix_assimp_export_consistency Hugo Pereira 2019-05-03 11:12:56 +01:00
  • 2f38545cc4 Merge pull request #2429 from RichardTea/obj_nan Kim Kulling 2019-05-03 11:20:25 +02:00
  • 6d5f8cbe26 Merge branch 'master' into obj_nan Kim Kulling 2019-05-02 01:36:45 +02:00
  • 3e57510af5 Merge pull request #2426 from Epsirom/issue-2339 Kim Kulling 2019-05-01 23:23:45 +02:00
  • 8dacbf49f9 Merge branch 'master' into issue-2339 Kim Kulling 2019-05-01 19:47:36 +02:00
  • 5498a50612 Merge pull request #2425 from simonppg/master Kim Kulling 2019-05-01 19:47:09 +02:00
  • 7c48552462 Merge branch 'master' into master Kim Kulling 2019-05-01 18:15:22 +02:00
  • 647d2f8d18 Merge pull request #2418 from Cgettys/fix-mingw-debug-build Kim Kulling 2019-05-01 18:13:12 +02:00
  • e108b6f1d2 Merge branch 'master' into fix-mingw-debug-build Kim Kulling 2019-05-01 17:04:45 +02:00
  • 37bf09ef0b Merge pull request #2442 from assimp/RichardTea-collada_metadata Kim Kulling 2019-05-01 17:04:01 +02:00
  • d9cfc48a66 Update script_x86.iss Kim Kulling 2019-05-01 15:53:04 +02:00
  • c93886e87b Update script_x64.iss Kim Kulling 2019-05-01 15:52:27 +02:00
  • 3ee85a8cc8 Update script_x86.iss Kim Kulling 2019-05-01 15:13:56 +02:00
  • 615a78e38f Update script_x86.iss Kim Kulling 2019-05-01 14:41:51 +02:00
  • 84e7f542fb Update script_x86.iss Kim Kulling 2019-05-01 12:10:52 +02:00
  • 6ff7635338 Update script_x64.iss Kim Kulling 2019-05-01 11:10:16 +02:00
  • a2ca691072 Update script_x86.iss Kim Kulling 2019-05-01 11:09:20 +02:00
  • 84d5398d56 Merge branch 'master' into bad-obj-file Vitaly Ovchinnikov 2019-05-01 19:08:50 +12:00
  • b96d53c05d Merge pull request #6 from assimp/master RichardTea 2019-04-30 17:14:22 +01:00
  • 800616e83a Fix if block kimkulling 2019-04-30 15:51:32 +02:00
  • c821c6f301 Fix names of dlls. kimkulling 2019-04-30 15:33:31 +02:00
  • 718109c17e Merge branch 'master' into master Adam B 2019-04-29 10:54:02 -07:00
  • 0b9c72fa94 Merge branch 'master' into collada_metadata Kim Kulling 2019-04-29 18:49:31 +02:00
  • ae9cb02427 Merge pull request #2441 from jslee02/fix_color_alpha Kim Kulling 2019-04-29 18:48:58 +02:00
  • 9ab7f88cdf Merge branch 'master' into gltf2-import-animation-name George Shakula 2019-04-29 18:46:56 +03:00
  • bcd17481e5 Fix element access operator of aiColor4D Jeongseok Lee 2019-04-28 22:16:20 -07:00
  • 243b2618a9 Updated the FBXConverter to correctly set the material shading mode when a Phong shader is detected b1skit 2019-04-27 17:37:23 -07:00
  • bc4e411284 Updated the FBXConverter to correctly set the material shading mode when a Phong shader is detected b1skit 2019-04-27 17:20:27 -07:00
  • 27665ce930 Merge branch 'master' into collada_metadata Kim Kulling 2019-04-27 10:30:49 +02:00
  • 55cdf1d37c Merge pull request #2437 from assimp/kimkulling-patch-4 Kim Kulling 2019-04-27 10:30:35 +02:00
  • bd53e67110 Merge branch 'master' into kimkulling-patch-4 Kim Kulling 2019-04-27 09:27:39 +02:00
  • 3824f17223 Merge pull request #2436 from assimp/kimkulling-appveyor Kim Kulling 2019-04-27 09:26:41 +02:00
  • 0853623924 Update appveyor.yml Kim Kulling 2019-04-27 08:38:01 +02:00
  • 6d241cc2f0 Update appveyor.yml Kim Kulling 2019-04-26 21:11:23 +02:00
  • 4c3e34ba6c Update Readme.md Kim Kulling 2019-04-26 19:28:19 +02:00
  • 09905c2de3 Update appveyor.yml Kim Kulling 2019-04-26 19:11:22 +02:00
  • 58b1440fc8 Update appveyor.yml Kim Kulling 2019-04-26 13:01:22 +02:00
  • 42202c2204 a test for bad OBJ file format and code fix that handles it Vitaly Ovchinnikov 2019-04-26 22:13:29 +12:00
  • e83671f494 Generate attenuation constants if non are privded in the Blender file. Using: https://imdoingitwrong.wordpress.com/2011/01/31/light-attenuation/ Martin Vorbrodt 2019-04-24 18:35:14 -04:00
  • 0b42d55f73 Fix inconsistency between animation and node name in glTF2 Importer Heorhii Shakula 2019-04-24 16:58:35 +03:00
  • 48e5b948e3 Update ColladaExporter.cpp Kim Kulling 2019-04-24 09:03:59 +02:00
  • 5713be615c [FBX export] fixed ordering of skin indices and weights, to be consistent between systems Hugo Pereira 2019-04-18 16:52:47 +01:00
  • c34327b355 use std::isfinite() RichardTea 2019-04-17 14:30:40 +01:00
  • e8bcf162dd OBJ coerce invalid nan or inf texture coords to 0 RichardTea 2019-04-17 13:55:08 +01:00
  • 51be6236a7 Merge branch 'master' into assimpview_unicode RichardTea 2019-04-17 12:10:14 +01:00
  • 7b6cb57e3b Merge branch 'collada_metadata' RichardTea 2019-04-17 12:07:48 +01:00
  • 00f1fd6f7c Merge branch 'master' into assimpview_unicode RichardTea 2019-04-17 10:48:37 +01:00