Bastien Montagne 8f670dd855 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/BKE_material.h
	source/blender/blenkernel/BKE_mesh.h
	source/blender/blenkernel/intern/library_remap.c
	source/blender/blenkernel/intern/material.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/render/render_preview.c
	source/blender/makesrna/intern/rna_object.c

2018-05-29 16:02:53 +02:00

..

AnimationExporter.cpp

Cleanup: fix compiler warnings on macOS / clang.

2018-04-28 16:28:19 +02:00

AnimationExporter.h

Fix blenderplayer and collada build.

2018-04-17 11:01:52 +02:00

AnimationImporter.cpp

Merge remote-tracking branch 'origin/master' into blender2.8

2018-04-20 15:05:22 +02:00

AnimationImporter.h

Fix Collada: Import of animations for objects with multiple materials

2018-04-06 12:42:38 +02:00

ArmatureExporter.cpp

Depsgraph: remove EvaluationContext, pass Depsgraph instead.

2018-04-16 19:55:33 +02:00

ArmatureExporter.h

Depsgraph: remove EvaluationContext, pass Depsgraph instead.

2018-04-16 19:55:33 +02:00

ArmatureImporter.cpp

Merge branch 'master' into blender2.8

2018-04-15 12:03:09 +02:00

ArmatureImporter.h

fix:T53271 now using the context scene layer as requested

2018-01-26 13:37:45 +01:00

CameraExporter.cpp

Apply patch [#36601].

2013-09-05 06:58:27 +00: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-03-17 14:24:06 +01:00

collada_utils.cpp

Collections and groups unification

2018-05-18 13:34:24 +02:00

collada_utils.h

Depsgraph: remove EvaluationContext, pass Depsgraph instead.

2018-04-16 19:55:33 +02:00

collada.cpp

Depsgraph: remove EvaluationContext, pass Depsgraph instead.

2018-04-16 19:55:33 +02:00

collada.h

Depsgraph: remove EvaluationContext, pass Depsgraph instead.

2018-04-16 19:55:33 +02:00

ControllerExporter.cpp

Depsgraph: remove EvaluationContext, pass Depsgraph instead.

2018-04-16 19:55:33 +02:00

ControllerExporter.h

Depsgraph: remove EvaluationContext, pass Depsgraph instead.

2018-04-16 19:55:33 +02:00

DocumentExporter.cpp

Remove Blender Internal and legacy viewport from Blender 2.8.

2018-04-19 17:35:25 +02:00

DocumentExporter.h

Fix blenderplayer and collada build.

2018-04-17 11:01:52 +02:00

DocumentImporter.cpp

Collections and groups unification

2018-05-18 13:34:24 +02:00

DocumentImporter.h

Remove Blender Internal and legacy viewport from Blender 2.8.

2018-04-19 17:35:25 +02:00

EffectExporter.cpp

Remove Blender Internal and legacy viewport from Blender 2.8.

2018-04-19 17:35:25 +02:00

EffectExporter.h

Remove Blender Internal and legacy viewport from Blender 2.8.

2018-04-19 17:35:25 +02:00

ErrorHandler.cpp

fix T50198: The OpenCollada error handler must return true after detecting uncritical errors.

2018-02-01 00:41:39 +01: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

Fix #35255: build for older OpenCollada versions failed, but don't see a good

2013-05-08 10:07:58 +00:00

ExtraHandler.h

Fix #35255: build for older OpenCollada versions failed, but don't see a good

2013-05-08 10:07:58 +00:00

ExtraTags.cpp

Collada: Adding support for bone roll and bone layers

2016-05-28 19:22:06 +02:00

ExtraTags.h

Collada: Adding support for bone roll and bone layers

2016-05-28 19:22:06 +02:00

GeometryExporter.cpp

Depsgraph: remove EvaluationContext, pass Depsgraph instead.

2018-04-16 19:55:33 +02:00

GeometryExporter.h

Depsgraph: remove EvaluationContext, pass Depsgraph instead.

2018-04-16 19:55:33 +02:00

ImageExporter.cpp

Remove Blender Internal and legacy viewport from Blender 2.8.

2018-04-19 17:35:25 +02:00

ImageExporter.h

Remove TexFace, per-face images

2017-05-24 23:38:15 +10: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-04-16 17:24:20 +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

Remove Blender Internal and legacy viewport from Blender 2.8.

2018-04-19 17:35:25 +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

style cleanup

2013-03-08 04:00:06 +00:00

MeshImporter.cpp

Merge branch 'master' into blender2.8

2018-05-29 16:02:53 +02:00

MeshImporter.h

Remove Blender Internal and legacy viewport from Blender 2.8.

2018-04-19 17:35:25 +02:00

SceneExporter.cpp

Collections and groups unification

2018-05-18 13:34:24 +02:00

SceneExporter.h

Depsgraph: remove EvaluationContext, pass Depsgraph instead.

2018-04-16 19:55:33 +02:00

SkinInfo.cpp

Remove workspace object mode, reverts changes w/ 2.8

2018-04-05 18:21:14 +02:00

SkinInfo.h

fix:T53271 now using the context scene layer as requested

2018-01-26 13:37:45 +01:00

TransformReader.cpp

collada: Simplify reading Node Matrix

2017-03-23 14:14:22 +01:00

TransformReader.h

Collada - removed TransformBase baseclass (not needed for anything)

2017-03-23 14:14:22 +01:00

TransformWriter.cpp

Fix blenderplayer and collada build.

2018-04-17 11:01:52 +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