[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34754] trunk/blender: Small consistency fixups

[Joshua Leung]

Revision: 34754
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34754
Author:   aligorith
Date:     2011-02-10 09:39:55 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
Small consistency fixups

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_dopesheet.py
    trunk/blender/source/blender/editors/animation/anim_channels_edit.c

Modified: trunk/blender/release/scripts/ui/space_dopesheet.py
===================================================================
--- trunk/blender/release/scripts/ui/space_dopesheet.py	2011-02-10 09:29:31 UTC (rev 34753)
+++ trunk/blender/release/scripts/ui/space_dopesheet.py	2011-02-10 09:39:55 UTC (rev 34754)
@@ -243,6 +243,7 @@
 
         layout.separator()
         layout.operator("anim.channels_editable_toggle")
+        layout.operator_menu_enum("action.extrapolation_type", "type", text="Extrapolation Mode")
 
         layout.separator()
         layout.operator("anim.channels_expand")
@@ -278,7 +279,6 @@
         layout.operator_menu_enum("action.keyframe_type", "type", text="Keyframe Type")
         layout.operator_menu_enum("action.handle_type", "type", text="Handle Type")
         layout.operator_menu_enum("action.interpolation_type", "type", text="Interpolation Mode")
-        layout.operator_menu_enum("action.extrapolation_type", "type", text="Extrapolation Mode")
 
         layout.separator()
         layout.operator("action.clean")

Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c	2011-02-10 09:29:31 UTC (rev 34753)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c	2011-02-10 09:39:55 UTC (rev 34754)
@@ -1052,7 +1052,7 @@
 				// FIXME: actions should only be considered once!
 				if (adt->action)
 					rearrange_action_channels(&ac, adt->action, mode);
-				else
+				else if (G.f & G_DEBUG)
 					printf("animdata has no action\n");
 				break;
 		}
@@ -1082,7 +1082,7 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
 	/* props */
-	RNA_def_enum(ot->srna, "direction", prop_animchannel_rearrange_types, REARRANGE_ANIMCHAN_DOWN, "Direction", "");
+	ot->prop= RNA_def_enum(ot->srna, "direction", prop_animchannel_rearrange_types, REARRANGE_ANIMCHAN_DOWN, "Direction", "");
 }
 
 /* ******************** Delete Channel Operator *********************** */