[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35694] trunk/blender: properties were being used with wrong type functions, this resulted in bad memory access when getting int from an enum.
Campbell Barton
ideasman42 at gmail.com
Tue Mar 22 13:53:36 CET 2011
Revision: 35694
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35694
Author: campbellbarton
Date: 2011-03-22 12:53:36 +0000 (Tue, 22 Mar 2011)
Log Message:
-----------
properties were being used with wrong type functions, this resulted in bad memory access when getting int from an enum.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
trunk/blender/source/blender/editors/armature/armature_ops.c
trunk/blender/source/blender/editors/curve/curve_ops.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/metaball/mball_edit.c
trunk/blender/source/blender/editors/metaball/mball_ops.c
trunk/blender/source/blender/editors/physics/physics_ops.c
trunk/blender/source/blender/editors/space_action/action_ops.c
trunk/blender/source/blender/editors/space_graph/graph_ops.c
trunk/blender/source/blender/editors/space_nla/nla_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c
trunk/blender/source/blender/editors/transform/transform_ops.c
Modified: trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py 2011-03-22 12:53:18 UTC (rev 35693)
+++ trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py 2011-03-22 12:53:36 UTC (rev 35694)
@@ -162,8 +162,8 @@
obj = context.object
if not obj or obj.type != 'MESH':
- print('Error, no active mesh object, aborting')
- return('CANCELLED',)
+ self.report({'ERROR'}, "Error, no active mesh object, aborting")
+ return {'CANCELLED'}
mesh = obj.data
Modified: trunk/blender/source/blender/editors/armature/armature_ops.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_ops.c 2011-03-22 12:53:18 UTC (rev 35693)
+++ trunk/blender/source/blender/editors/armature/armature_ops.c 2011-03-22 12:53:36 UTC (rev 35694)
@@ -180,7 +180,7 @@
ot= WM_operatortype_append_macro("ARMATURE_OT_extrude_move", "Extrude", OPTYPE_UNDO|OPTYPE_REGISTER);
if(ot) {
otmacro=WM_operatortype_macro_define(ot, "ARMATURE_OT_extrude");
- RNA_enum_set(otmacro->ptr, "forked", 0);
+ RNA_boolean_set(otmacro->ptr, "forked", 0);
otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
RNA_enum_set(otmacro->ptr, "proportional", 0);
}
@@ -190,7 +190,7 @@
ot= WM_operatortype_append_macro("ARMATURE_OT_extrude_forked", "Extrude Forked", OPTYPE_UNDO|OPTYPE_REGISTER);
if(ot) {
otmacro=WM_operatortype_macro_define(ot, "ARMATURE_OT_extrude");
- RNA_enum_set(otmacro->ptr, "forked", 1);
+ RNA_boolean_set(otmacro->ptr, "forked", 1);
otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
RNA_enum_set(otmacro->ptr, "proportional", 0);
}
Modified: trunk/blender/source/blender/editors/curve/curve_ops.c
===================================================================
--- trunk/blender/source/blender/editors/curve/curve_ops.c 2011-03-22 12:53:18 UTC (rev 35693)
+++ trunk/blender/source/blender/editors/curve/curve_ops.c 2011-03-22 12:53:36 UTC (rev 35694)
@@ -231,7 +231,7 @@
WM_keymap_add_item(keymap, "CURVE_OT_reveal", HKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "CURVE_OT_hide", HKEY, KM_PRESS, 0, 0);
- RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_hide", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected", 1);
+ RNA_boolean_set(WM_keymap_add_item(keymap, "CURVE_OT_hide", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected", 1);
WM_keymap_add_item(keymap, "OBJECT_OT_vertex_parent_set", PKEY, KM_PRESS, KM_CTRL, 0);
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2011-03-22 12:53:18 UTC (rev 35693)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2011-03-22 12:53:36 UTC (rev 35694)
@@ -4731,7 +4731,7 @@
static int extrude_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
{
if(extrude_exec(C, op) == OPERATOR_FINISHED) {
- RNA_int_set(op->ptr, "mode", TFM_TRANSLATION);
+ RNA_enum_set(op->ptr, "mode", TFM_TRANSLATION);
WM_operator_name_call(C, "TRANSFORM_OT_transform", WM_OP_INVOKE_REGION_WIN, op->ptr);
return OPERATOR_FINISHED;
@@ -5608,7 +5608,7 @@
{
duplicate_exec(C, op);
- RNA_int_set(op->ptr, "mode", TFM_TRANSLATION);
+ RNA_enum_set(op->ptr, "mode", TFM_TRANSLATION);
WM_operator_name_call(C, "TRANSFORM_OT_transform", WM_OP_INVOKE_REGION_WIN, op->ptr);
return OPERATOR_FINISHED;
Modified: trunk/blender/source/blender/editors/metaball/mball_edit.c
===================================================================
--- trunk/blender/source/blender/editors/metaball/mball_edit.c 2011-03-22 12:53:18 UTC (rev 35693)
+++ trunk/blender/source/blender/editors/metaball/mball_edit.c 2011-03-22 12:53:36 UTC (rev 35694)
@@ -302,7 +302,7 @@
int retv= duplicate_metaelems_exec(C, op);
if (retv == OPERATOR_FINISHED) {
- RNA_int_set(op->ptr, "mode", TFM_TRANSLATION);
+ RNA_enum_set(op->ptr, "mode", TFM_TRANSLATION);
WM_operator_name_call(C, "TRANSFORM_OT_transform", WM_OP_INVOKE_REGION_WIN, op->ptr);
}
Modified: trunk/blender/source/blender/editors/metaball/mball_ops.c
===================================================================
--- trunk/blender/source/blender/editors/metaball/mball_ops.c 2011-03-22 12:53:18 UTC (rev 35693)
+++ trunk/blender/source/blender/editors/metaball/mball_ops.c 2011-03-22 12:53:36 UTC (rev 35694)
@@ -65,7 +65,7 @@
WM_keymap_add_item(keymap, "MBALL_OT_reveal_metaelems", HKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "MBALL_OT_hide_metaelems", HKEY, KM_PRESS, 0, 0);
- RNA_enum_set(WM_keymap_add_item(keymap, "MBALL_OT_hide_metaelems", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected", 1);
+ RNA_boolean_set(WM_keymap_add_item(keymap, "MBALL_OT_hide_metaelems", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected", 1);
WM_keymap_add_item(keymap, "MBALL_OT_delete_metaelems", XKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "MBALL_OT_delete_metaelems", DELKEY, KM_PRESS, 0, 0);
Modified: trunk/blender/source/blender/editors/physics/physics_ops.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_ops.c 2011-03-22 12:53:18 UTC (rev 35693)
+++ trunk/blender/source/blender/editors/physics/physics_ops.c 2011-03-22 12:53:36 UTC (rev 35694)
@@ -108,7 +108,7 @@
WM_keymap_add_item(keymap, "PARTICLE_OT_reveal", HKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, 0, 0);
- RNA_enum_set(WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected", 1);
+ RNA_boolean_set(WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected", 1);
WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", LEFTMOUSE, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
Modified: trunk/blender/source/blender/editors/space_action/action_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_ops.c 2011-03-22 12:53:18 UTC (rev 35693)
+++ trunk/blender/source/blender/editors/space_action/action_ops.c 2011-03-22 12:53:36 UTC (rev 35694)
@@ -98,7 +98,7 @@
if (ot) {
WM_operatortype_macro_define(ot, "ACTION_OT_duplicate");
otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_transform");
- RNA_int_set(otmacro->ptr, "mode", TFM_TIME_DUPLICATE);
+ RNA_enum_set(otmacro->ptr, "mode", TFM_TIME_DUPLICATE);
}
}
Modified: trunk/blender/source/blender/editors/space_graph/graph_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_ops.c 2011-03-22 12:53:18 UTC (rev 35693)
+++ trunk/blender/source/blender/editors/space_graph/graph_ops.c 2011-03-22 12:53:36 UTC (rev 35694)
@@ -279,7 +279,7 @@
if (ot) {
WM_operatortype_macro_define(ot, "GRAPH_OT_duplicate");
otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_transform");
- RNA_int_set(otmacro->ptr, "mode", TFM_TIME_DUPLICATE);
+ RNA_enum_set(otmacro->ptr, "mode", TFM_TIME_DUPLICATE);
}
}
Modified: trunk/blender/source/blender/editors/space_nla/nla_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_edit.c 2011-03-22 12:53:18 UTC (rev 35693)
+++ trunk/blender/source/blender/editors/space_nla/nla_edit.c 2011-03-22 12:53:36 UTC (rev 35694)
@@ -656,7 +656,7 @@
{
nlaedit_duplicate_exec(C, op);
- RNA_int_set(op->ptr, "mode", TFM_TRANSLATION);
+ RNA_enum_set(op->ptr, "mode", TFM_TRANSLATION);
WM_operator_name_call(C, "TRANSFORM_OT_transform", WM_OP_INVOKE_REGION_WIN, op->ptr);
return OPERATOR_FINISHED;
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2011-03-22 12:53:18 UTC (rev 35693)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c 2011-03-22 12:53:36 UTC (rev 35694)
@@ -1656,7 +1656,7 @@
{
sequencer_add_duplicate_exec(C, op);
- RNA_int_set(op->ptr, "mode", TFM_TRANSLATION);
+ RNA_enum_set(op->ptr, "mode", TFM_TRANSLATION);
WM_operator_name_call(C, "TRANSFORM_OT_transform", WM_OP_INVOKE_REGION_WIN, op->ptr);
return OPERATOR_FINISHED;
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c 2011-03-22 12:53:18 UTC (rev 35693)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c 2011-03-22 12:53:36 UTC (rev 35694)
@@ -180,7 +180,7 @@
int i;
for (i = 1; i <= 10; i++) {
- RNA_enum_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_cut_multicam", keys[i-1], KM_PRESS, 0, 0)->ptr, "camera", i);
+ RNA_int_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_cut_multicam", keys[i-1], KM_PRESS, 0, 0)->ptr, "camera", i);
}
}
Modified: trunk/blender/source/blender/editors/transform/transform_ops.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_ops.c 2011-03-22 12:53:18 UTC (rev 35693)
+++ trunk/blender/source/blender/editors/transform/transform_ops.c 2011-03-22 12:53:36 UTC (rev 35694)
@@ -882,19 +882,19 @@
break;
case SPACE_ACTION:
km= WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", GKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TIME_TRANSLATE);
+ RNA_enum_set(km->ptr, "mode", TFM_TIME_TRANSLATE);
km= WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", EVT_TWEAK_S, KM_ANY, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TIME_TRANSLATE);
+ RNA_enum_set(km->ptr, "mode", TFM_TIME_TRANSLATE);
km= WM_keymap_add_item(keymap, "TRANSFORM_OT_transform", EKEY, KM_PRESS, 0, 0);
- RNA_int_set(km->ptr, "mode", TFM_TIME_EXTEND);
+ RNA_enum_set(km->ptr, "mode", TFM_TIME_EXTEND);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list