griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed invalid RNA access in radial brush operators (like strength/size abjustment)

Browse Source
This commit is contained in:
Sergey Sharybin
2011-04-03 20:00:19 +00:00
parent 3fb74f8e59
commit a30ebdeb68
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/brush.c
View File

@@ -1210,7 +1210,7 @@ static struct ImBuf *brush_gen_radial_control_imbuf(Brush *br)
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 @@ void brush_radial_control_invoke(wmOperator *op, Brush *br, float size_weight)
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;

6
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -2742,7 +2742,7 @@ int WM_radial_control_modal(bContext *C, wmOperator *op, wmEvent *event)
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 @@ int WM_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
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 @@ int WM_radial_control_invoke(bContext *C, wmOperator *op, wmEvent *event)
/* 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)