griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
64ecd3d2e7ca9495c0733791b293d682f2a03bd0
test2/source/blender/collada
History
Bastien Montagne 43eebdfebd Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/collada/DocumentImporter.cpp
	source/blender/editors/include/ED_object.h
	source/blender/editors/object/object_modifier.c
2018-06-12 12:58:31 +02:00
..
AnimationExporter.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
AnimationExporter.h
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
AnimationImporter.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
AnimationImporter.h
Cleanup: trailing space
2018-06-08 08:07:48 +02:00
ArmatureExporter.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
ArmatureExporter.h
Cleanup: Nuke moar G.main usages...
2018-06-07 11:11:46 +02:00
ArmatureImporter.cpp
Merge branch 'master' into blender2.8
2018-06-12 12:58:31 +02:00
ArmatureImporter.h
Merge branch 'master' into blender2.8
2018-06-12 12:58:31 +02:00
CameraExporter.cpp
Cleanup: trailing space
2018-06-08 08:07:48 +02:00
CameraExporter.h
Apply patch [#36601].
2013-09-05 06:58:27 +00:00
CMakeLists.txt
Depsgraph: Remove old depsgraph header from collada
2017-04-06 16:17:21 +02:00
collada_internal.cpp
Merge branch 'master' into blender2.8
2018-03-17 14:24:06 +01:00
collada_internal.h
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
collada_utils.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
collada_utils.h
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
collada.cpp
Cleanup: Nuke moar G.main usages...
2018-06-07 11:11:46 +02:00
collada.h
Merge branch 'master' into blender2.8
2018-06-07 11:23:26 +02:00
ControllerExporter.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
ControllerExporter.h
Depsgraph: remove EvaluationContext, pass Depsgraph instead.
2018-04-16 19:55:33 +02:00
DocumentExporter.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
DocumentExporter.h
Cleanup: Nuke moar G.main usages...
2018-06-07 11:11:46 +02:00
DocumentImporter.cpp
Merge branch 'master' into blender2.8
2018-06-12 12:58:31 +02:00
DocumentImporter.h
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
EffectExporter.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
EffectExporter.h
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
ErrorHandler.cpp
Cleanup: trailing space
2018-06-08 08:07:48 +02:00
ErrorHandler.h
style cleanup: function calls & whitespace.
2012-04-29 17:11:40 +00:00
ExportSettings.cpp
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
ExportSettings.h
merge from master (needed to fix collada headerfiles which have been modified in master and in blender2.8 slightly different)
2018-02-28 17:29:56 +01:00
ExtraHandler.cpp
Cleanup: trailing space
2018-06-08 08:07:48 +02:00
ExtraHandler.h
Cleanup: trailing space
2018-06-08 08:07:48 +02:00
ExtraTags.cpp
Cleanup: trailing space
2018-06-08 08:07:48 +02:00
ExtraTags.h
Cleanup: trailing space
2018-06-08 08:07:48 +02:00
GeometryExporter.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
GeometryExporter.h
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
ImageExporter.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
ImageExporter.h
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
ImportSettings.cpp
Cleanup: style
2015-01-21 11:57:11 +11:00
ImportSettings.h
Collada: Moved structure definitions for export settings to the exportSettings.h Also make typedefs for import/export structures.
2018-02-28 16:05:28 +01:00
InstanceWriter.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
InstanceWriter.h
collada: export UV Textures as materials. Note: the reimport of the exported collada files will have materials assigned instead of UV Face Textures! This is expected behavior
2017-06-24 22:16:47 +02:00
LightExporter.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
LightExporter.h
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
MaterialExporter.cpp
Cleanup: indentation
2018-04-16 17:08:27 +02:00
MaterialExporter.h
Cleanup: trailing space
2018-06-08 08:07:48 +02:00
MeshImporter.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
MeshImporter.h
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
SceneExporter.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
SceneExporter.h
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
SkinInfo.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
SkinInfo.h
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
TransformReader.cpp
Cleanup: trailing space
2018-06-08 08:07:48 +02:00
TransformReader.h
Cleanup: trailing space
2018-06-08 08:07:48 +02:00
TransformWriter.cpp
Merge branch 'master' into blender2.8
2018-06-08 08:10:35 +02:00
TransformWriter.h
Pass EvaluationContext argument everywhere
2017-07-21 14:47:26 +02:00
version.conf
Added new file that contains the sha1 hash key of the currently to be used OpenCollada libraries
2013-09-30 21:11:20 +00:00