[Bf-blender-cvs] [61b52f6d90] blender2.8: Fix previous commit because there are some code using this define, but really it is not used in editors. This is a temporary fix to broken editors, but this entry must be removed or moved to the right place when particles are in place again.

Antonio Vazquez noreply at git.blender.org
Tue Jan 17 15:54:57 CET 2017


Commit: 61b52f6d900d123835dc8577374a1ddbd4f9277e
Author: Antonio Vazquez
Date:   Tue Jan 17 15:53:31 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB61b52f6d900d123835dc8577374a1ddbd4f9277e

Fix previous commit because there are some code using this define, but really it is not used in editors. This is a temporary fix to broken editors, but this entry must be removed or moved to the right place when particles are in place again.

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

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 c96502f3c0..67eb9e252c 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -183,7 +183,13 @@ typedef enum eAnim_ChannelType {
 	ANIMTYPE_NLAACTION,
 	
 	/* always as last item, the total number of channel types... */
-	ANIMTYPE_NUM_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
+
 } eAnim_ChannelType;
 
 /* types of keyframe data in bAnimListElem */




More information about the Bf-blender-cvs mailing list