342e73f90f
Spelling fixes in comments and descriptions (2.8 changes), patch by luzpaz.
...
Differential Revision: https://developer.blender.org/D3719
2018-09-24 18:48:29 +02:00
253dce07d7
Merge branch 'master' into blender2.8
2018-09-24 17:42:52 +02:00
0cff044d84
Spelling fixes in comments and descriptions, patch by luzpaz.
...
Differential Revision: https://developer.blender.org/D3719
2018-09-24 17:28:40 +02:00
a59d7374ea
Nuke DM out of collada code.
...
Also, now use out-of-main temp copy of mesh for export, and fixed a
potential memleak (return without freeing temp copy of mesh, tsst).
2018-06-24 18:40:52 +02:00
87b2444270
Merge branch 'master' into blender2.8
...
Conflicts:
source/blender/collada/AnimationExporter.cpp
source/blender/collada/AnimationExporter.h
source/blender/collada/ArmatureImporter.cpp
source/blender/collada/ArmatureImporter.h
source/blender/collada/ControllerExporter.cpp
source/blender/collada/ControllerExporter.h
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/collada/GeometryExporter.cpp
source/blender/collada/GeometryExporter.h
source/blender/collada/MeshImporter.cpp
source/blender/collada/MeshImporter.h
source/blender/collada/SkinInfo.cpp
source/blender/collada/SkinInfo.h
source/blender/collada/collada_utils.cpp
source/blender/collada/collada_utils.h
2018-06-14 15:55:51 +02:00
fd19069999
Cleanup: remove last G.main's from Collada code.
2018-06-14 15:15:51 +02:00
908b6960c0
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
a25c11fd8d
Cleanup: trailing space
...
Remove from blender/nodes, collada, blenfont & render.
2018-06-08 08:07:48 +02:00
34ab90f546
Depsgraph: remove EvaluationContext, pass Depsgraph instead.
...
The depsgraph was always created within a fixed evaluation context. Passing
both risks the depsgraph and evaluation context not matching, and it
complicates the Python API where we'd have to expose both which is not so
easy to understand.
This also removes the global evaluation context in main, which assumed there
to be a single active scene and view layer.
Differential Revision: https://developer.blender.org/D3152
2018-04-16 19:55:33 +02:00
9ed7093aa6
Merge branch 'master' into blender2.8
2018-03-17 14:24:06 +01:00
64fbd50e4c
Refactor: Collada: remove param, changed order of params in Function call
...
* In the Collada Module parameters are typically ordered
in a similar way. I changed this to:
extern std::string get_joint_id(Object *ob, Bone *bone);
* The Object parameter was not used in get_joint_sid().
I changed this to:
extern std::string get_joint_sid(Bone *bone);
2018-03-17 14:16:19 +01:00
f228a08d02
merge from master
2018-02-26 22:49:30 +01:00
a024da55af
Adding support for Matrix Transformation export
...
The exporter does export matrix data (4*4 Transformation matrix) only for Skeletal animation. For object animation only exporting to trans/rot/loc is implemented.
This task implements Matrix export also for simple Object animation.
Differential Revision: https://developer.blender.org/D3082
2018-02-26 17:16:56 +01:00
1b462e5a51
Pass EvaluationContext instead of bContext
...
2.8x branch added bContext arg in many places,
pass eval-context instead since its not simple to reason about what
what nested functions do when they can access and change almost anything.
Also use const to prevent unexpected modifications.
This fixes crash loading files with shadows,
since off-screen buffers use a NULL context for rendering.
2017-08-16 12:46:04 +10:00
ac0da72a60
Fix compilation error with Collada enabled
2017-07-21 17:44:11 +02:00
a2a301bdb9
collada: change image export: export either UV Textures or Materials. This
...
avoids wrong texture data when multiple objects are exported. Note: This
commit might possiblyt not work fully. The full feature is added with the
next commit)
2017-06-24 22:16:47 +02:00
368b74315a
Collada - add flag to limit precision of exported data, mainly to simplify debugging
2017-04-03 10:48:00 +02:00
476f5c473a
Collada - remove no longer used functions (moved to collada_utils)
2017-03-23 14:14:23 +01:00
51d4743033
Collada - Added support for custom bind matrix (using new bind_mat custom property)
2017-03-23 14:14:22 +01:00
647fb6ef1e
fix D2552: Collada - Follow up change to complete the fix in rBda6cd7762810 (use unique id for bones with same name in different armatures)
2017-03-14 19:31:25 +01:00
1cf1f48893
Cleanup: fix mismatch in printf formating (int/unsigned int).
...
Noisy and annoying with new gcc5...
2015-06-19 12:31:25 +02:00
b12f3cbee7
cleanup: style
2015-02-07 04:50:21 +11:00
7d040d2a08
Cleanup: use BLI_listbase_*** prefix for count,sort,sort_r
2014-11-16 13:57:58 +01:00
bba80ed7af
Cleanup
2014-08-17 12:18:40 +10:00
2af99b7437
Cleanup: silent C++11 warning (implicit double to float conversion) in Collada code.
2014-07-09 15:12:48 +02:00
d92f6b9903
T38763 Fix: avoid NPE When no custom properties are defined
2014-02-23 15:33:10 +01:00
fe5e1dd272
added support for double,float and int property values for maya restpose matrix properties
2014-02-19 13:57:52 +01:00
a0c1f009bf
Added Maya restpose_matrix support via custom properties to Collada exporter
2014-02-19 13:57:51 +01:00
e79b244097
Fix collada and freestyle module compile errors after recent commit, forgot to
...
compile with those enabled.
2014-01-15 19:15:51 +01:00
c819fd4ee0
Changed some labels from Second Life to OpenSim
2013-10-03 14:24:54 +00:00
1d4bd90c84
Avoid creating Morph Controllers when shape key export is disabled
2013-07-18 07:54:19 +00:00
ec8d277c64
BLI_math rename functions:
...
- mult_m4_m4m4 -> mul_m4_m4m4
- mult_m3_m3m4 -> mul_m3_m3m4
these temporary names were used to avoid problems when argument order was switched.
2013-05-26 18:36:25 +00:00
655ed9cc7f
style cleanup
2013-03-18 11:44:56 +00:00
2921d48239
code cleanup: unused vars in collada, preprocessor formatting & warning in mingw.
...
also compiling without bullet needed a stub added.
2013-03-04 00:53:57 +00:00
be701b6278
Collada: Added support for ngon export/import and added triangulate option to export
2013-03-02 15:58:13 +00:00
4f3ca854e1
Fix various warnings with clang build, and adjust cmake clang warnings flags
...
to include a few more that gcc is using too.
2013-02-26 21:58:06 +00:00
8291a4fe08
fix : #34427 : Collada export crash with armature
2013-02-25 16:02:40 +00:00
942ad6d9cd
style cleanup
2013-02-10 17:06:05 +00:00
8b37f4724f
fix : #34051 Collada export crashes
2013-02-08 12:31:47 +00:00
69993c5d40
style cleanup: spaces -> tabs
2013-02-04 00:18:09 +00:00
6baf63c83b
Fix some warnings in the collade code, but did not fix two because they seem
...
to indicate bugs, left a comment about those.
2013-02-01 15:17:51 +00:00
c263753d17
Added gsoc-2012 collada improvements from bratwurst branch
2013-01-21 13:45:49 +00:00
