[Bf-blender-cvs] [c7e2b271994] functions: Merge branch 'master' into functions

[Jacques Lucke]

Commit: c7e2b27199459f5c7d96269ee708f85b41217f21
Author: Jacques Lucke
Date:   Mon Mar 18 16:08:50 2019 +0100
Branches: functions
https://developer.blender.org/rBc7e2b27199459f5c7d96269ee708f85b41217f21

Merge branch 'master' into functions

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



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

diff --cc source/blender/makesdna/DNA_anim_types.h
index ead43a1dddd,ccc0b2e4fcb..f17b93fed62
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@@ -401,22 -406,21 +406,23 @@@ typedef struct DriverVar 
  	float curval;
  } DriverVar;
  
- /* Driver Variable Types */
+ /** Driver Variable Types.* */
  typedef enum eDriverVar_Types {
- 		/* single RNA property */
+ 	/** single RNA property */
  	DVAR_TYPE_SINGLE_PROP	= 0,
- 		/* rotation difference (between 2 bones) */
+ 	/** rotation difference (between 2 bones) */
  	DVAR_TYPE_ROT_DIFF,
- 		/* distance between objects/bones */
+ 	/** distance between objects/bones */
  	DVAR_TYPE_LOC_DIFF,
- 		/* 'final' transform for object/bones */
+ 	/** 'final' transform for object/bones */
  	DVAR_TYPE_TRANSFORM_CHAN,
 +		/* evaluate function */
 +	DVAR_TYPE_FUNCTION,
  
- 	/* maximum number of variable types
- 	 * NOTE: this must always be th last item in this list,
- 	 *       so add new types above this line.
+ 	/** Maximum number of variable types.
+ 	 *
+ 	 * \note This must always be th last item in this list,
+ 	 * so add new types above this line.
  	 */
  	MAX_DVAR_TYPES
  } eDriverVar_Types;