[Bf-blender-cvs] [4bc62b3] master: Fix for RNA_int/enum mixup

Campbell Barton noreply at git.blender.org
Sun Jul 6 22:52:33 CEST 2014


Commit: 4bc62b31af30ffe2037a459882e249f234efd4c3
Author: Campbell Barton
Date:   Sun Jul 6 20:54:08 2014 +1000
https://developer.blender.org/rB4bc62b31af30ffe2037a459882e249f234efd4c3

Fix for RNA_int/enum mixup

===================================================================

M	source/blender/editors/animation/anim_channels_edit.c
M	source/blender/editors/space_nla/nla_select.c

===================================================================

diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index ab190e0..9997cc0 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -2078,7 +2078,7 @@ static void ANIM_OT_channels_collapse(wmOperatorType *ot)
  *  3) No drivers
  */
  
-static int animchannels_clean_empty_exec(bContext *C, wmOperator *op)
+static int animchannels_clean_empty_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	bAnimContext ac;
 	
diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c
index 0d26f37..8261397 100644
--- a/source/blender/editors/space_nla/nla_select.c
+++ b/source/blender/editors/space_nla/nla_select.c
@@ -465,9 +465,9 @@ static int nlaedit_select_leftright_invoke(bContext *C, wmOperator *op, const wm
 		/* determine which side of the current frame mouse is on */
 		x = UI_view2d_region_to_view_x(v2d, event->mval[0]);
 		if (x < CFRA)
-			RNA_int_set(op->ptr, "mode", NLAEDIT_LRSEL_LEFT);
+			RNA_enum_set(op->ptr, "mode", NLAEDIT_LRSEL_LEFT);
 		else
-			RNA_int_set(op->ptr, "mode", NLAEDIT_LRSEL_RIGHT);
+			RNA_enum_set(op->ptr, "mode", NLAEDIT_LRSEL_RIGHT);
 	}
 	
 	/* perform selection */




More information about the Bf-blender-cvs mailing list