[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24610] trunk/blender/source/blender/ editors/animation/anim_channels_edit.c: removing drivers was trying to remove the fcurve from the actions fcurve list if an action was set , now check if the context is for drivers first.

Campbell Barton ideasman42 at gmail.com
Tue Nov 17 15:32:19 CET 2009


Revision: 24610
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24610
Author:   campbellbarton
Date:     2009-11-17 15:32:19 +0100 (Tue, 17 Nov 2009)

Log Message:
-----------
removing drivers was trying to remove the fcurve from the actions fcurve list if an action was set, now check if the context is for drivers first.
not 100% sure this is correct but removing fcurves worked in my tests for actions and drivers.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_channels_edit.c

Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c	2009-11-17 14:10:29 UTC (rev 24609)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c	2009-11-17 14:32:19 UTC (rev 24610)
@@ -854,13 +854,16 @@
 				 *	- Action
 				 *	- Drivers
 				 *	- TODO... some others?
+				 *
+				 *	note: this isn't well tested, we could also try remove
+				 *	      from all lists just to be safe - campbell
 				 */
 				if (fcu->grp)
 					action_groups_remove_channel(adt->action, fcu);
+				else if (ac.datatype == ANIMCONT_DRIVERS)
+					BLI_remlink(&adt->drivers, fcu);
 				else if (adt->action)
 					BLI_remlink(&adt->action->curves, fcu);
-				else if (ac.datatype == ANIMCONT_DRIVERS)
-					BLI_remlink(&adt->drivers, fcu);
 					
 				/* free the F-Curve itself */
 				free_fcurve(fcu);





More information about the Bf-blender-cvs mailing list