[Bf-blender-cvs] [3216831c76] blender2.8: T50457 Remove temporary solution for animation types and put in definitve position

Antonio Vazquez noreply at git.blender.org
Tue Jan 17 20:04:36 CET 2017


Commit: 3216831c7638c84600323ff17d5c881400900c7b
Author: Antonio Vazquez
Date:   Tue Jan 17 20:01:59 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB3216831c7638c84600323ff17d5c881400900c7b

T50457 Remove temporary solution for animation types and put in definitve position

After revert the commit rB4b99958ca12642, the line added at the end of the enum is not necessary anymore because it is replaced by the corresponding element in the list in the right position.

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

M	source/blender/editors/include/ED_anim_api.h

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

diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index 67eb9e252c..4a4ab832b2 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -161,6 +161,7 @@ typedef enum eAnim_ChannelType {
 	ANIMTYPE_DSSKEY,
 	ANIMTYPE_DSWOR,
 	ANIMTYPE_DSNTREE,
+	ANIMTYPE_DSPART,
 	ANIMTYPE_DSMBALL,
 	ANIMTYPE_DSARM,
 	ANIMTYPE_DSMESH,
@@ -183,13 +184,7 @@ typedef enum eAnim_ChannelType {
 	ANIMTYPE_NLAACTION,
 	
 	/* always as last item, the total number of channel types... */
-	ANIMTYPE_NUM_TYPES,
-
-	/* TODO: WARNING remove this entry or move to the right place when particle system is enabled again. 
-	   This definition was set here only to compile, but it is not used and cannot be in the middle of the list 
-	   or break the editors */
-	ANIMTYPE_DSPART
-
+	ANIMTYPE_NUM_TYPES
 } eAnim_ChannelType;
 
 /* types of keyframe data in bAnimListElem */




More information about the Bf-blender-cvs mailing list