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

Conflicts:
	source/blender/collada/MeshImporter.cpp
	source/blender/editors/object/object_add.c
	source/blender/editors/screen/screen_edit.c

2017-06-15 15:54:11 +02:00

..

AnimationExporter.cpp

Depsgraph: Remove all layer bit flags related checks

2017-04-05 11:39:30 +02:00

AnimationExporter.h

Cleanup: warnings, ws

2015-04-16 01:12:22 +10:00

AnimationImporter.cpp

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

AnimationImporter.h

Fix T46074: Collada crashes importing animation

2015-09-11 18:46:08 +10:00

ArmatureExporter.cpp

Collada - add flag to limit precision of exported data, mainly to simplify debugging

2017-04-03 10:48:00 +02:00

ArmatureExporter.h

fix D2552: Collada - use unique id for bones with same name but in different armatures. Co-authored-by: Gaia <gaia.clary@machiniamtrix.org>

2017-03-14 14:35:51 +01:00

ArmatureImporter.cpp

Depsgraph: Remove old depsgraph header from collada

2017-04-06 16:17:21 +02:00

ArmatureImporter.h

Fix: Collada Importer did not import the Blender Profile information correctly when multiple objects are bound to same armature. This caused Bone tails to be placed wrong.

2016-09-24 01:06:32 +02: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

Collada - removed TransformBase baseclass (not needed for anything)

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

collada_internal.h

Collada - removed TransformBase baseclass (not needed for anything)

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

collada_utils.cpp

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

collada_utils.h

fix: T50412 - collada: Replaced precision local limit function by blender's own implementation

2017-04-01 15:29:50 +02:00

collada.cpp

Remove TexFace, per-face images

2017-05-24 23:38:15 +10:00

collada.h

Remove TexFace, per-face images

2017-05-24 23:38:15 +10:00

ControllerExporter.cpp

Collada - add flag to limit precision of exported data, mainly to simplify debugging

2017-04-03 10:48:00 +02:00

ControllerExporter.h

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

DocumentExporter.cpp

Refactor BKE_blender into separate headers

2016-04-25 19:27:45 +10:00

DocumentExporter.h

fix T47484: Added proper error reporting for Collada Exporter

2016-02-20 21:42:12 +01:00

DocumentImporter.cpp

Merge branch 'master' into blender2.8

2017-06-15 15:54:11 +02:00

DocumentImporter.h

Cleanup: redundant struct declarations

2015-03-29 03:56:39 +11:00

EffectExporter.cpp

Remove TexFace, per-face images

2017-05-24 23:38:15 +10:00

EffectExporter.h

Added option for exporting material based textures. Cleaned up header files due to a bug in osx

2012-06-23 22:03:31 +00:00

ErrorHandler.cpp

Cleanup: spelling

2016-07-16 17:48:57 +10: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

Remove TexFace, per-face images

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

fix T44884: corrected a wrong usage of the CustomLayer API (due to a misunderstanding)

2015-05-30 14:19:01 +02:00

GeometryExporter.h

Added Support for Custom Vertex Normals to Collada exporter

2015-04-16 19:02:26 +02:00

ImageExporter.cpp

Remove TexFace, per-face images

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

Added new option for storing bindpose matrix, see T50412

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

InstanceWriter.cpp

Collada: fixed export when 'active UV Layer only' was selected

2012-08-15 22:08:22 +00:00

InstanceWriter.h

Collada: (Export) Added export of surface textures, and control over exported uv layers

2012-06-22 16:16:58 +00:00

LightExporter.cpp

Cleanup: Internal degrees removal.

2013-12-03 20:35:45 +01: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

Fix #33168: collada export added incorrect -material postfix to material names.

2012-11-27 21:26:06 +00:00

MaterialExporter.h

style cleanup

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

MeshImporter.cpp

Merge branch 'master' into blender2.8

2017-06-15 15:54:11 +02:00

MeshImporter.h

Remove TexFace, per-face images

2017-05-24 23:38:15 +10:00

SceneExporter.cpp

Split id->flag in two, persistent flags and runtime tags.

2015-12-27 12:00:33 +01:00

SceneExporter.h

Collada: Added option for how rot,loc,trans data is exported (improves flexibility for support of other 3D tools)

2013-03-06 23:21:52 +00:00

SkinInfo.cpp

Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h

2017-06-08 10:17:04 +02:00

SkinInfo.h

define the size of matrix args for both rows/cols.

2012-12-11 14:29:01 +00: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

Collada - removed TransformBase baseclass (not needed for anything)

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

TransformWriter.h

Collada - removed TransformBase baseclass (not needed for anything)

2017-03-23 14:14:22 +01: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