[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47275] branches/soc-2011-tomato/source/ blender/blenkernel/intern/anim_sys.c: support for mask keyframing

Campbell Barton ideasman42 at gmail.com
Thu May 31 14:24:06 CEST 2012


Revision: 47275
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47275
Author:   campbellbarton
Date:     2012-05-31 12:24:06 +0000 (Thu, 31 May 2012)
Log Message:
-----------
support for mask keyframing

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c	2012-05-31 12:12:28 UTC (rev 47274)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.c	2012-05-31 12:24:06 UTC (rev 47275)
@@ -90,6 +90,7 @@
 		case ID_SPK:
 		case ID_SCE:
 		case ID_MC:
+		case ID_MSK:
 		{
 			return 1;
 		}
@@ -802,10 +803,13 @@
 
 	/* objects */
 	ANIMDATA_IDS_CB(mainptr->object.first);
+
+	/* masks */
+	ANIMDATA_IDS_CB(mainptr->mask.first);
 	
 	/* worlds */
 	ANIMDATA_IDS_CB(mainptr->world.first);
-	
+
 	/* scenes */
 	ANIMDATA_NODETREE_IDS_CB(mainptr->scene.first, Scene);
 }
@@ -886,6 +890,9 @@
 
 	/* objects */
 	RENAMEFIX_ANIM_IDS(mainptr->object.first); 
+
+	/* masks */
+	RENAMEFIX_ANIM_IDS(mainptr->mask.first);
 	
 	/* worlds */
 	RENAMEFIX_ANIM_IDS(mainptr->world.first);
@@ -2350,6 +2357,9 @@
 	 * linked from other (not-visible) scenes will not need their data calculated.
 	 */
 	EVAL_ANIM_IDS(main->object.first, 0); 
+
+	/* masks */
+	EVAL_ANIM_IDS(main->mask.first, ADT_RECALC_ANIM);
 	
 	/* worlds */
 	EVAL_ANIM_NODETREE_IDS(main->world.first, World, ADT_RECALC_ANIM);




More information about the Bf-blender-cvs mailing list