 Alexander Gessler
|
5847576f41
Merge pull request #703 from terziman/master
|
10 лет назад |
 Joe Hermaszewski
|
210764a6ff
Correct spelling
|
10 лет назад |
 Kim Kulling
|
35fafe3a6f
ColladaParser: use initializer lists again.
|
10 лет назад |
|
Kim Kulling
|
b694bfd021
fix build
|
10 лет назад |
 Léo Terziman
|
6eebf8455a
Merge remote-tracking branch 'official/master' into contrib
|
10 лет назад |
|
Léo Terziman
|
445ae1fec3
In collada: implemented all missing transparency features from standard (ie RGB_ZERO, RGB_ONE and A_ZERO)
|
10 лет назад |
|
Kim Kulling
|
0a6788d56f
try to fix build.
|
10 лет назад |
|
Kim Kulling
|
6641188a8e
assimp/issues/702: fix resource leak and use initializer list for all
|
10 лет назад |
 Danke Xie
|
24b68b1e3d
Support instance_image in Collada 1.5 files
|
10 лет назад |
 Gargaj
|
9885c3e551
add opencollada extension
|
10 лет назад |
 Wil Shipley
|
7a7a496320
- Add include of stdarg, because apparently that's needed to build of Github server with Travis.
|
10 лет назад |
|
Wil Shipley
|
8b7fa48d27
- Merge in latest from assimp/assimp on GitHub (5c00aef7cd8ab6b7f86c8297958a630f9459dc53)
|
10 лет назад |
 Richard
|
83de707587
Refactor: Expand tabs to 4 spaces
|
10 лет назад |
|
Richard
|
a96a595a7a
Refactor: Trim trailing whitespace
|
10 лет назад |
|
Richard
|
4c1a0507fe
Refactor: Line endings are LF, not CRLF
|
10 лет назад |
|
Kim Kulling
|
2bfc353fde
License info: update year info.
|
10 лет назад |
|
Wil Shipley
|
91ca983d5f
- Workaround for Collada exporter in SketchUp 15.3.331 (possibly others) where it'll export the wrong "count" when exporting "lines".
|
10 лет назад |
|
Léo Terziman
|
91c751a03a
Added missing header
|
10 лет назад |
|
Léo Terziman
|
5b9af11f9b
Merge remote-tracking branch 'official/master' into contrib
|
10 лет назад |
 abma
|
8c45a4dc3b
Merge remote-tracking branch 'origin'
|
10 лет назад |
|
abma
|
bf4913b5c9
remove AssimpPCH.h: fixes #534
|
10 лет назад |
|
Léo Terziman
|
60d58901a5
Merge remote-tracking branch 'official/master' into contrib
|
10 лет назад |
 Alexander Gessler
|
16880b3dbd
Fix build after mis-merge.
|
11 лет назад |
|
Alexander Gessler
|
c59878e427
Merge branch 'master' of github.com:assimp/assimp
|
11 лет назад |
|
Léo Terziman
|
18ef31cc06
Merge remote-tracking branch 'official/master' into contrib
|
11 лет назад |
 DenisMikhalev
|
c410512173
Use material names, set default direction to UP_Y, process extra tag
|
11 лет назад |
 Turo Lamminen
|
5a74e07f5f
Mark some more functions with AI_WONT_RETURN
|
11 лет назад |
|
Léo Terziman
|
d9a2293491
Improved handling of transparency in collada importer
|
11 лет назад |
|
Alexander Gessler
|
ce1302cd71
Fix VC12 warning "empty but controlled statement found".
|
11 лет назад |
|
Léo Terziman
|
b367d9b390
Fixed some warnings related to empty statement when using assert & building in release mode
|
11 лет назад |
