[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23348] trunk/blender/source/blender: Missed one file in previous commit, and silencing some compiler warnings I overlooked.

[Joshua Leung]

Revision: 23348
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23348
Author:   aligorith
Date:     2009-09-19 14:38:49 +0200 (Sat, 19 Sep 2009)

Log Message:
-----------
Missed one file in previous commit, and silencing some compiler warnings I overlooked.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/anim_sys.c
    trunk/blender/source/blender/editors/space_nla/space_nla.c

Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2009-09-19 12:36:22 UTC (rev 23347)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2009-09-19 12:38:49 UTC (rev 23348)
@@ -1547,8 +1547,8 @@
 		
 		/* do compositing nodes first (since these aren't included in main tree) */
 		if (scene->nodetree) {
-			AnimData *adt2= BKE_animdata_from_id(scene->nodetree);
-			BKE_animsys_evaluate_animdata(scene->nodetree, adt2, ctime, ADT_RECALC_ANIM);
+			AnimData *adt2= BKE_animdata_from_id((ID *)scene->nodetree);
+			BKE_animsys_evaluate_animdata((ID *)scene->nodetree, adt2, ctime, ADT_RECALC_ANIM);
 		}
 		
 		/* now execute scene animation data as per normal */

Modified: trunk/blender/source/blender/editors/space_nla/space_nla.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/space_nla.c	2009-09-19 12:36:22 UTC (rev 23347)
+++ trunk/blender/source/blender/editors/space_nla/space_nla.c	2009-09-19 12:38:49 UTC (rev 23348)
@@ -409,6 +409,7 @@
 			break;
 		case NC_SCENE:
 			switch(wmn->data) {
+				case ND_RENDER_OPTIONS:
 				case ND_OB_ACTIVE:
 				case ND_FRAME:
 				case ND_MARKERS: