b392322454
Remove M3Importer from vc9 solution.
2013-06-25 00:12:03 +02:00
fd2f1ca3a8
Merge pull request #56 from asmaloney/init_stuff
...
Make sure members are initialized properly
2013-06-21 09:53:41 -07:00
1da281c1f8
Make sure members are initialized properly
...
Prefer initialization lists
Assignment operator should not return a const ref
2013-06-21 10:56:11 -04:00
f91abbc0fb
Merge pull request #55 from asmaloney/OBJ_spaces
...
{OBJ} Allow spaces in group names
2013-06-20 05:50:53 -07:00
d7c6cd9ece
{OBJ} Allow spaces in group names
2013-06-20 08:40:08 -04:00
ca8f923a8b
Merge pull request #53 from asmaloney/collada_warnings
...
{COLLADA} Add detail to some errors/warnings
2013-06-16 06:59:24 -07:00
a03cb84d0c
{COLLADA} Add detail to some errors/warnings & prefer '<>' for elements for readability
2013-06-15 18:00:40 -04:00
88da17a246
Drop M3 Importer.
2013-06-13 11:22:23 +02:00
27c578675a
Merge pull request #51 from asmaloney/init_fixes
...
Prefer init list and add missing initializations
2013-06-12 08:16:14 -07:00
84e3bf50ba
Merge pull request #52 from asmaloney/minor_changes
...
Fix a logging message and a comment
2013-06-12 08:15:52 -07:00
c6d1a73854
Fix a logging message and a comment
2013-06-12 09:01:05 -04:00
0e54b87b1e
Prefer init list and add missing initializations
2013-06-12 08:59:47 -04:00
9040724fc0
Merge pull request #49 from severin-lemaignan/master
...
[pyassimp] Fixes for python 3.3 and 64bits
2013-06-03 02:17:52 -07:00
2494608927
[pyassimp] Fix py3.3 + 64bits issues
...
64-bit Compatibility:
The first four characters of a String material property would be cut
off. A String's length is defined in structs.py as a c_size_t
variable, which is 8 bytes wide on 64-bit Python. However, when an
aiString is used as an aiMaterial property in C/C++, the length is
truncated down to a 4-byte value on 64-bit machines (see
MaterialSystem.cpp aiMaterial::AddProperty() for details). A new
struct was declared in structs.py (MaterialPropertyString) and used
in core._get_properties().
Python 3.3 Compatibility:
The built-in function hasattr() changed in Python 3.2 to not
trap exceptions, which means a NULL pointer ValueException now
escaped when checking if a pointer was valid (hasattr(obj,
'contents') in core.call_init()) (see
http://bugs.python.org/issue9666 for details). A new helper
function was defined that preserves the legacy functionality of
trapping the exceptions (helper.hasattr_silent()) and used
throughout the code as a replacement for hasattr().
String objects would import as "bytes" rather than as a
string. This was most noticeable in the key names for
material properties, where the trailing ' of a bytes object
would remain after it was converted to a string. The
solution was to call decode() on the bytes object using
utf-8 decoding. This applies to various parts of core.py.
Closes #35
2013-06-03 10:38:30 +02:00
43dd6fb3bc
[pyassimp] Check cmd line args in sample.py
2013-06-03 10:37:48 +02:00
024bd4c470
[pyassimp] Handle diffuse/ambient values stored as vec3 instead of vec4
2013-06-03 10:22:39 +02:00
08e078e20d
Merge pull request #44 from thetrime/master
...
Collada importer should respect units in file
2013-05-24 07:37:04 -07:00
d411cbfbf4
Make use of unit tag in asset info to scale the whole model
2013-05-23 12:15:14 +12:00
be457757a5
Merge pull request #39 from devurandom/fix/pedantic-c99
...
Fixes errors with -pedantic -std=c99 and GCC 4.7.2
2013-05-16 06:53:52 -07:00
2bdbcd78e7
Amend dd1a18149cac29a69a0242a5efc467498f5f05cd: Visibility attribute is needed for MSVC/C++
2013-05-16 13:08:05 +02:00
a65a69fdc9
Fixes a bunch of errors with -pedantic -std=c99 and GCC 4.7.2: ISO C restricts enumerator values to range of ‘int’
2013-05-16 13:08:05 +02:00
bcc311515a
Fixes an error with -pedantic -std=c99 and GCC 4.7.2: ‘visibility’ attribute ignored on types
2013-05-16 13:08:05 +02:00
5205ee06da
Merge pull request #40 from devurandom/feature/gitignore
...
Add gitignore file
2013-05-14 04:50:39 -07:00
8535ebd730
Add gitignore file
2013-05-14 10:48:37 +02:00
b8ed6fbcef
Fix Heap corruption in BlenderImporter::ConvertMesh function. closes #36
2013-05-03 23:16:56 +02:00
24daead8cb
Merge branch 'master' of github.com:assimp/assimp into msvc-pch
2013-04-30 00:48:35 +02:00
98aec0955d
- remove web shortcuts from root.
2013-04-30 00:48:07 +02:00
48591e17b1
Merge pull request #34 from assimp/msvc-pch
...
- LWO: fix crash when computing normals for meshes that contain line or point faces.
2013-04-26 07:54:59 -07:00
51d7bf8266
Merge branch 'master' of github.com:assimp/assimp into msvc-pch
2013-04-26 16:51:43 +02:00
7efb94580f
- LWO: fix crash when computing normals for meshes that contain line or point faces. Thanks to Thomas Sevaldrud for the patch.
2013-04-26 16:49:24 +02:00
8b7fdb3a39
Merge pull request #33 from assimp/msvc-pch
...
- CMake: enable multicore compilation with vc.
2013-04-21 06:05:06 -07:00
758e470a49
Merge branch 'master' of github.com:assimp/assimp into msvc-pch
2013-04-21 15:04:04 +02:00
b786d6e375
- CMake: enable multicore compilation with msvc.
2013-04-21 15:03:16 +02:00
680c8e31d9
Merge pull request #32 from assimp/msvc-pch
...
- CMake: use precompiled headers when compiling with msvc,
2013-04-20 14:22:19 -07:00
61b1cf7be1
Merge branch 'master' of github.com:assimp/assimp into msvc-pch
2013-04-20 23:17:16 +02:00
4b748c2442
- CMake: use precompiled headers when compiling for msvc. This makes compilation about 40% faster.
2013-04-20 23:15:59 +02:00
a2541a8984
Update .travis.yml
2013-04-19 01:41:45 +03:00
a81c10265a
- update travis.yml to also test compilation without the export part (2nd try).
2013-04-19 01:40:02 +03:00
540265f617
- update travis.yml to also test compilation without the export part.
2013-04-19 01:37:41 +03:00
17e888e762
Merge pull request #31 from jdduke/patch-1
...
Enable aiMaterial::AddProperty template specializations in ASSIMP_NO_EXPORT builds
2013-04-18 01:15:48 -07:00
6551fd4903
Update material.inl
...
aiMaterial::AddProperty template specializations are used by import methods in B3DImporter and SceneProcessor; they should be defined accordingly even when ASSIMP_BUILD_NO_EXPORT is defined.
2013-04-17 18:47:52 -07:00
863645e88b
Merge pull request #30 from assimp/gcc-fixes
...
workaround for older gcc versions (<4.6) sometimes copying temporaries even though they shouldn't.
2013-04-13 07:17:28 -07:00
f476634461
Merge branch 'master' of github.com:assimp/assimp into gcc-fixes
2013-04-13 16:10:37 +02:00
17e2588588
- workaround for older gcc versions (<4.6) sometimes copying temporaries even though they shouldn't.
2013-04-13 16:08:13 +02:00
02533c11a0
Merge pull request #28 from assimp/gcc-fixes
...
Gcc fixes based on this build: https://travis-ci.org/assimp/assimp/jobs/6160384
silence gcc false positive warnings and fix real issues that were pointed out.
2013-04-08 14:27:04 -07:00
afe1dd8c02
Merge branch 'master' of github.com:assimp/assimp into gcc-fixes
2013-04-08 23:21:33 +02:00
a288a631e2
- FBX: avoid more gcc warnings.
2013-04-08 20:21:28 +02:00
bd05acf872
bugfix : fix unresolved symbols if 3DS-import is configured not to be oart of the lib.
...
Signed-off-by: Kim <Kulling>
2013-04-08 20:16:56 +02:00
232e69dc2a
- Ifc: code cleanup, remove various non-needed variables as pointed out by gcc.
2013-04-08 20:10:25 +02:00
052a8634d2
OgreMaterial: remove unneeded variable.
2013-04-08 20:05:56 +02:00
Alexander Gessler
Andy Maloney
Andy Maloney
Kim Kulling
Bill Roeske
Séverin Lemaignan
Matt Lilley
Dennis Schridde
Jared Duke
Kim