100a7a7c11
Merge branch 'master' into master
2020-02-25 20:51:17 +01:00
c5aa7cceee
Merge pull request #3024 from malortie/remove-else-endif-constructs-cmake-files
...
Removed uneeded expression in else() and endif() constructs.
2020-02-25 20:44:10 +01:00
e56def7585
Fix indentation.
2020-02-25 14:52:59 +11:00
ae50c4ebdf
Add support for orthographic camera information and use in glTF2 importer. Fixes #3030 .
2020-02-25 14:45:00 +11:00
fb5b01958a
Fix to read orthographic camera data. Manual merge for this branch. Fixes #3028
2020-02-25 11:03:07 +11:00
be391a3b66
Merge pull request #13 from assimp/master
...
Update to upstream master
2020-02-25 10:39:49 +11:00
e4b2fd246d
Merge branch 'master' into remove-else-endif-constructs-cmake-files
2020-02-24 20:08:17 +01:00
28f4b95ff5
Merge branch 'master' into master
2020-02-24 21:05:51 +02:00
824a412239
Merge pull request #3009 from inhosens/master
...
A bug when importing multiple gltf files
2020-02-24 20:05:19 +01:00
edfaaed56f
Removed uneeded expression in else() and endif() constructs.
...
The following changes were tested against building with a master copy.
For a more detailed report, please read the followings below:
The flags that were checked were the ones checked by default + the following:
ASSIMP_BUILD_ASSIMP_VIEW
ASSIMP_BUILD_SAMPLES
The list of compilable projects in Visual Studio were the following:
- assimp
- assimp_cmd
- assimp_simpleogl
- assimp_simpletextureddirectx11
- assimp_simpletexturedogl
- assimp_viewer
- INSTALL
- IrrXML
- uninstall
- unit
- UpdateAssimpLibsDebugSymbolsAndDLLs
- ZERO_CHECK
- zlib
- zlibstatic
The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run.
UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004 .
2020-02-23 07:09:35 -05:00
55e9171e1f
Merge branch 'master' into master
2020-02-22 21:13:33 +01:00
344170469c
Merge branch 'master' into master
2020-02-22 22:04:48 +02:00
55eb89d476
Merge pull request #3013 from malortie/common-directory-for-compiled-binaries
...
Made changes to write compiled binaries to a common directory.
2020-02-22 21:01:56 +01:00
2d382c5e76
Merge branch 'master' into common-directory-for-compiled-binaries
2020-02-22 09:05:28 +01:00
f3c89b0bd7
Merge branch 'master' into master
2020-02-21 20:23:42 +02:00
4e414eb4ef
Merge remote-tracking branch 'origin/master'
2020-02-21 20:17:49 +02:00
f28b087d16
small improvements in the CMakeLists.txt file
...
If ASSIMP_NO_EXPORT is not defined:
- don't add the macro for the exporters
- don't include the files for all the exporter
- don't display any messages about what exporters are enabled or not
2020-02-21 20:17:38 +02:00
3f5136b7b2
Merge branch 'master' into master
2020-02-19 21:52:57 +01:00
848922feae
Merge pull request #3014 from iamAdrianIusca/master
...
small changes
2020-02-19 21:47:33 +01:00
93d1586f44
Merge branch 'master' into master
2020-02-19 21:31:24 +02:00
bc3ed5f702
Merge pull request #3021 from malortie/fix-simpletexturedopengl-memory-leaks
...
Fixed memory leaks in SimpleTexturedOpenGL sample.
2020-02-19 20:13:02 +01:00
4d27fccd0b
Fixed memory leaks in SimpleTexturedOpenGL sample.
...
- Added function "cleanup" to centralize release of resources.
- Added function "freeTextureIds" to free textureIds memory.
- Added call to freeTextureIds in LoadGLTextures to free memory before it is allocated again.
- Made several changes in KillGLWindow to prevent certain Win32 handle/resources
from being released more than once.
2020-02-19 13:17:45 -05:00
93de396373
Merge branch 'master' into master
2020-02-19 16:03:33 +02:00
8639bbabc7
Merge pull request #3020 from assimp/kimkulling-clangformat
...
Keep post-processor intentions
2020-02-19 12:35:09 +01:00
8d6d8e2e38
Update .clang-format
...
Update clang.format to keep formatting of hashes in include file to optimize readabilaty.
2020-02-19 10:42:30 +01:00
4de0237167
small fix
2020-02-18 21:55:35 +02:00
a5524ffcd9
more changes
2020-02-18 19:02:14 +02:00
ad52c5c5f6
.clear in destructor is redundant
2020-02-18 18:56:09 +02:00
bf85fc1386
small changes
2020-02-18 18:50:48 +02:00
016c0a8665
small changes
2020-02-18 18:42:59 +02:00
76908002c6
Merge remote-tracking branch 'origin/master'
2020-02-18 18:25:17 +02:00
d0922230a9
fixed the = default on the destructor
2020-02-18 18:24:52 +02:00
ba925e8860
Merge branch 'master' into master
2020-02-18 17:23:02 +01:00
0811a69dab
Merge branch 'master' into master
2020-02-18 18:02:25 +02:00
485e474a0c
Merge remote-tracking branch 'origin/master'
2020-02-18 18:02:03 +02:00
a65bac27e9
fixed the make_unique
2020-02-18 18:01:53 +02:00
fb3c3048a5
Merge branch 'master' into enable_vs_warning_all
2020-02-18 14:47:38 +01:00
6e13381bdb
next warnings.
2020-02-18 14:41:19 +01:00
10c84c9226
Merge pull request #3015 from malortie/fix-simpletexturedopengl-sample
...
Fixed SimpleTexturedOpenGL sample.
2020-02-18 14:24:26 +01:00
51ebe1abfb
Merge branch 'master' into fix-simpletexturedopengl-sample
2020-02-17 23:22:06 +01:00
221e56769f
Merge branch 'master' into kimkulling_dev
2020-02-16 19:56:26 +01:00
92da00329f
Update irrArray.h
...
fix init ordering.
2020-02-16 18:10:52 +01:00
22118dff1d
Merge branch 'master' into enable_vs_warning_all
2020-02-16 15:37:48 +01:00
c2bfbdacf4
fix more warnings.
2020-02-16 15:37:20 +01:00
919da48cdc
Merge pull request #3016 from assimp/kimkulling-patch-1-1
...
Update .clang-format
2020-02-16 15:36:58 +01:00
d75f46280d
Update irrString.h
...
fiix ordering of initializiation
2020-02-16 15:32:29 +01:00
ec3a5620d0
Update AssxmlExporter.cpp
...
Fix the build.
2020-02-16 15:04:18 +01:00
ada4f51d5b
Merge branch 'master' into kimkulling_dev
2020-02-16 13:10:41 +01:00
b3d894ee73
Update CMakeLists.txt
...
temporary disable iiXml test until xml-parser migration is ready.
2020-02-16 13:06:38 +01:00
eb8abfa02c
Update .clang-format
...
Disable tabs.
2020-02-16 12:37:46 +01:00
Kim Kulling
Paul Arden
Adrian Iusca
Marc-Antoine Lortie
iamAdrianIusca
Justin Carpentier
Kim Kulling