[Bf-blender-cvs] [807c8c6e17b] collada: Merge 'master' into 'collada'

[Brecht Van Lommel]

Commit: 807c8c6e17b9e553a440edc246e19b665d507012
Author: Brecht Van Lommel
Date:   Thu May 2 16:05:01 2019 +0200
Branches: collada
https://developer.blender.org/rB807c8c6e17b9e553a440edc246e19b665d507012

Merge 'master' into 'collada'

===================================================================



===================================================================

diff --cc source/blender/collada/AnimationExporter.h
index cf55a98ad95,fa0640c73e8..67fb987d42a
--- a/source/blender/collada/AnimationExporter.h
+++ b/source/blender/collada/AnimationExporter.h
@@@ -84,15 -84,9 +84,15 @@@ struct Depsgraph
  typedef enum BC_animation_source_type {
  	BC_SOURCE_TYPE_VALUE,
  	BC_SOURCE_TYPE_ANGLE,
- 	BC_SOURCE_TYPE_TIMEFRAME
+ 	BC_SOURCE_TYPE_TIMEFRAME,
  } BC_animation_source_type;
  
 +typedef enum BC_global_rotation_type {
 +	BC_NO_ROTATION,
 +	BC_OBJECT_ROTATION,
 +	BC_DATA_ROTATION
 +} BC_global_rotation_type;
 +
  class AnimationExporter: COLLADASW::LibraryAnimations
  {
  private: