|
|
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 |
|
|
|
376fc19b24
|
fix:T53271 now using the context scene layer as requested
|
2018-01-26 13:37:45 +01:00 |
|
|
|
7c699a217a
|
define the size of matrix args for both rows/cols.
|
2012-12-11 14:29:01 +00:00 |
|
|
|
1dccd4c98a
|
code cleanup: naming - pose/armature/image
also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
|
2012-05-05 16:03:57 +00:00 |
|
|
|
2b7ca2304a
|
unify include guard defines, __$FILENAME__
without the underscores these clogged up the namespace for autocompleation which was annoying.
|
2012-02-17 18:59:41 +00:00 |
|
|
|
4a04f72069
|
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
|
2011-10-23 17:52:20 +00:00 |
|
Nathan Letwory
|
bcec824299
|
doxygen: COLLADA entry
|
2011-02-21 08:38:53 +00:00 |
|
|
|
9f3d203acb
|
SVN maintenance.
|
2010-10-05 00:49:39 +00:00 |
|
Nathan Letwory
|
82209cdc86
|
Reorganisation of COLLADA import code. Classes have been split into their own files.
No functional changes.
Where necessary extern "C" {} blocks have been added.
|
2010-10-05 00:05:14 +00:00 |
|
