[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51039] trunk/blender/source/blender: code cleanup: comment verse outliner views, also correct warning in recent commit.

[Campbell Barton]

Revision: 51039
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51039
Author:   campbellbarton
Date:     2012-10-04 11:39:30 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
code cleanup: comment verse outliner views, also correct warning in recent commit.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/keyframing.c
    trunk/blender/source/blender/makesdna/DNA_space_types.h

Modified: trunk/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframing.c	2012-10-04 11:37:17 UTC (rev 51038)
+++ trunk/blender/source/blender/editors/animation/keyframing.c	2012-10-04 11:39:30 UTC (rev 51039)
@@ -1186,10 +1186,9 @@
 	
 	/* if Outliner, don't allow in some views */
 	if (so) {
-		if (ELEM4(so->outlinevis, SO_GROUPS, SO_LIBRARIES, SO_VERSE_SESSION, SO_VERSE_SESSION))
+		if (ELEM5(so->outlinevis, SO_GROUPS, SO_LIBRARIES, SO_SEQUENCE, SO_USERDEF, SO_KEYMAP)) {
 			return 0;
-		if (ELEM3(so->outlinevis, SO_SEQUENCE, SO_USERDEF, SO_KEYMAP))
-			return 0;
+		}
 	}
 	
 	/* TODO: checks for other space types can be added here */
@@ -1444,7 +1443,7 @@
  * it is more useful for animators working in the 3D view.
  */
  
-static int clear_anim_v3d_exec(bContext *C, wmOperator *op)
+static int clear_anim_v3d_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Main *bmain = CTX_data_main(C);
 	
@@ -1530,7 +1529,7 @@
 	CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
 	{
 		ID *id = &ob->id;
-		size_t success = 0;
+		int success = 0;
 		
 		/* just those in active action... */
 		if ((ob->adt) && (ob->adt->action)) {
@@ -1549,7 +1548,7 @@
 		}
 		
 		/* report success (or failure) */
-		BKE_reportf(op->reports, RPT_INFO, "Object '%s' successfully had %u keyframes removed", id->name + 2, success);
+		BKE_reportf(op->reports, RPT_INFO, "Object '%s' successfully had %d keyframes removed", id->name + 2, success);
 		ob->recalc |= OB_RECALC_OB;
 	}
 	CTX_DATA_END;

Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h	2012-10-04 11:37:17 UTC (rev 51038)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h	2012-10-04 11:39:30 UTC (rev 51039)
@@ -264,8 +264,8 @@
 	SO_SAME_TYPE = 5,
 	SO_GROUPS = 6,
 	SO_LIBRARIES = 7,
-	SO_VERSE_SESSION = 8,
-	SO_VERSE_MS = 9,
+	/* SO_VERSE_SESSION = 8, */  /* deprecated! */
+	/* SO_VERSE_MS = 9, */       /* deprecated!*/
 	SO_SEQUENCE = 10,
 	SO_DATABLOCKS = 11,
 	SO_USERDEF = 12,