[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35980] trunk/blender/source/blender: Fixed invalid RNA access in radial brush operators (like strength/ size abjustment)

[Sergey Sharybin]

Revision: 35980
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35980
Author:   nazgul
Date:     2011-04-03 20:00:19 +0000 (Sun, 03 Apr 2011)
Log Message:
-----------
Fixed invalid RNA access in radial brush operators (like strength/size abjustment)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/brush.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c	2011-04-03 17:45:23 UTC (rev 35979)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c	2011-04-03 20:00:19 UTC (rev 35980)
@@ -1210,7 +1210,7 @@
 
 void brush_radial_control_invoke(wmOperator *op, Brush *br, float size_weight)
 {
-	int mode = RNA_int_get(op->ptr, "mode");
+	int mode = RNA_enum_get(op->ptr, "mode");
 	float original_value= 0;
 
 	if(mode == WM_RADIALCONTROL_SIZE)
@@ -1229,7 +1229,7 @@
 
 int brush_radial_control_exec(wmOperator *op, Brush *br, float size_weight)
 {
-	int mode = RNA_int_get(op->ptr, "mode");
+	int mode = RNA_enum_get(op->ptr, "mode");
 	float new_value = RNA_float_get(op->ptr, "new_value");
 	const float conv = 0.017453293;
 

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2011-04-03 17:45:23 UTC (rev 35979)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2011-04-03 20:00:19 UTC (rev 35980)
@@ -2742,7 +2742,7 @@
 	int ret = OPERATOR_RUNNING_MODAL;
 	// float initial_value = RNA_float_get(op->ptr, "initial_value");
 
-	mode = RNA_int_get(op->ptr, "mode");
+	mode = RNA_enum_get(op->ptr, "mode");
 	RNA_int_get_array(op->ptr, "initial_mouse", initial_mouse);
 
 	switch(event->type) {
@@ -2818,7 +2818,7 @@
 {
 	wmRadialControl *rc = MEM_callocN(sizeof(wmRadialControl), "radial control");
 	// wmWindow *win = CTX_wm_window(C);
-	int mode = RNA_int_get(op->ptr, "mode");
+	int mode = RNA_enum_get(op->ptr, "mode");
 	float initial_value = RNA_float_get(op->ptr, "initial_value");
 	//float initial_size = RNA_float_get(op->ptr, "initial_size");
 	int mouse[2];
@@ -2881,7 +2881,7 @@
 /* Gets a descriptive string of the operation */
 void WM_radial_control_string(wmOperator *op, char str[], int maxlen)
 {
-	int mode = RNA_int_get(op->ptr, "mode");
+	int mode = RNA_enum_get(op->ptr, "mode");
 	float v = RNA_float_get(op->ptr, "new_value");
 
 	if(mode == WM_RADIALCONTROL_SIZE)