Revision: 18543
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18543
Author: blendix
Date: 2009-01-17 00:58:10 +0100 (Sat, 17 Jan 2009)
Log Message:
-----------
RNA: forgot to rename some values in the keymaps in last commit.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
Modified:
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
2009-01-16 23:53:11 UTC (rev 18542)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
2009-01-16 23:58:10 UTC (rev 18543)
@@ -2956,7 +2956,7 @@
ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/;
/* props XXX figure out? */
- RNA_def_float(ot->srna, "sharpness", 0.01f, 0.0f, FLT_MAX, "sharpness",
"", 0.0f, FLT_MAX);
+ RNA_def_float(ot->srna, "sharpness", 0.01f, 0.0f, FLT_MAX, "sharpness",
"", 0.0f, 180.0f);
}
@@ -3128,7 +3128,7 @@
ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/;
/* props */
- RNA_def_float(ot->srna, "sharpness", 0.0f, 0.0f, FLT_MAX, "sharpness",
"", 0.0f, FLT_MAX);
+ RNA_def_float(ot->srna, "sharpness", 0.0f, 0.0f, FLT_MAX, "sharpness",
"", 0.0f, 180.0f);
}
void select_non_manifold(EditMesh *em)
Modified: branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
2009-01-16 23:53:11 UTC (rev 18542)
+++ branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
2009-01-16 23:58:10 UTC (rev 18543)
@@ -106,8 +106,8 @@
WM_keymap_add_item(keymap, "MESH_OT_select_non_manifold", MKEY,
KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0);
WM_keymap_add_item(keymap, "MESH_OT_selectconnected_mesh_all", LKEY,
KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "MESH_OT_selectconnected_mesh", LKEY,
KM_PRESS, 0, 0);
- RNA_float_set(WM_keymap_add_item(keymap,
"MESH_OT_select_linked_flat_faces", FKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT),
0)->ptr,"fsharpness",135.0);
- RNA_float_set(WM_keymap_add_item(keymap, "MESH_OT_select_sharp_edges",
SKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0)->ptr,"fsharpness",135.0);
+ RNA_float_set(WM_keymap_add_item(keymap,
"MESH_OT_select_linked_flat_faces", FKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT),
0)->ptr,"sharpness",135.0);
+ RNA_float_set(WM_keymap_add_item(keymap, "MESH_OT_select_sharp_edges",
SKEY, KM_PRESS, (KM_CTRL|KM_SHIFT|KM_ALT), 0)->ptr,"sharpness",135.0);
/* hide */
WM_keymap_add_item(keymap, "MESH_OT_hide_mesh", HKEY, KM_PRESS, 0, 0);
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
2009-01-16 23:53:11 UTC (rev 18542)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_ops.c
2009-01-16 23:58:10 UTC (rev 18543)
@@ -117,35 +117,35 @@
RNA_boolean_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewhome", CKEY,
KM_PRESS, KM_SHIFT, 0)->ptr, "center", 1);
/* numpad view hotkeys*/
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD0,
KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_CAMERA);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD1,
KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_FRONT);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD2,
KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_STEPDOWN);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD3,
KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_RIGHT);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD4,
KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_STEPLEFT);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD5,
KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_PERSPORTHO);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD6,
KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_STEPRIGHT);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD7,
KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_TOP);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD8,
KM_PRESS, 0, 0)->ptr, "viewnum", V3D_VIEW_STEPUP);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD1,
KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_BACK);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD3,
KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_LEFT);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD7,
KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_BOTTOM);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD2,
KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_PANDOWN);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD4,
KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_PANLEFT);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD6,
KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_PANRIGHT);
- RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD8,
KM_PRESS, KM_CTRL, 0)->ptr, "viewnum", V3D_VIEW_PANUP);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD0,
KM_PRESS, 0, 0)->ptr, "view", V3D_VIEW_CAMERA);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD1,
KM_PRESS, 0, 0)->ptr, "view", V3D_VIEW_FRONT);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD2,
KM_PRESS, 0, 0)->ptr, "view", V3D_VIEW_STEPDOWN);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD3,
KM_PRESS, 0, 0)->ptr, "view", V3D_VIEW_RIGHT);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD4,
KM_PRESS, 0, 0)->ptr, "view", V3D_VIEW_STEPLEFT);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD5,
KM_PRESS, 0, 0)->ptr, "view", V3D_VIEW_PERSPORTHO);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD6,
KM_PRESS, 0, 0)->ptr, "view", V3D_VIEW_STEPRIGHT);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD7,
KM_PRESS, 0, 0)->ptr, "view", V3D_VIEW_TOP);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD8,
KM_PRESS, 0, 0)->ptr, "view", V3D_VIEW_STEPUP);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD1,
KM_PRESS, KM_CTRL, 0)->ptr, "view", V3D_VIEW_BACK);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD3,
KM_PRESS, KM_CTRL, 0)->ptr, "view", V3D_VIEW_LEFT);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD7,
KM_PRESS, KM_CTRL, 0)->ptr, "view", V3D_VIEW_BOTTOM);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD2,
KM_PRESS, KM_CTRL, 0)->ptr, "view", V3D_VIEW_PANDOWN);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD4,
KM_PRESS, KM_CTRL, 0)->ptr, "view", V3D_VIEW_PANLEFT);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD6,
KM_PRESS, KM_CTRL, 0)->ptr, "view", V3D_VIEW_PANRIGHT);
+ RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD8,
KM_PRESS, KM_CTRL, 0)->ptr, "view", V3D_VIEW_PANUP);
/* drawtype */
km = WM_keymap_add_item(keymap, "VIEW3D_OT_drawtype", ZKEY, KM_PRESS,
0, 0);
- RNA_int_set(km->ptr, "drawtype", OB_SOLID);
- RNA_int_set(km->ptr, "drawtype_alt", OB_WIRE);
+ RNA_int_set(km->ptr, "draw_type", OB_SOLID);
+ RNA_int_set(km->ptr, "draw°type_alternate", OB_WIRE);
km = WM_keymap_add_item(keymap, "VIEW3D_OT_drawtype", ZKEY, KM_PRESS,
KM_ALT, 0);
- RNA_int_set(km->ptr, "drawtype", OB_TEXTURE);
- RNA_int_set(km->ptr, "drawtype_alt", OB_SOLID);
+ RNA_int_set(km->ptr, "draw_type", OB_TEXTURE);
+ RNA_int_set(km->ptr, "draw_type_alternate", OB_SOLID);
km = WM_keymap_add_item(keymap, "VIEW3D_OT_drawtype", ZKEY, KM_PRESS,
KM_SHIFT, 0);
- RNA_int_set(km->ptr, "drawtype", OB_SHADED);
- RNA_int_set(km->ptr, "drawtype_alt", OB_WIRE);
+ RNA_int_set(km->ptr, "draw_type", OB_SHADED);
+ RNA_int_set(km->ptr, "draw_type_alternate", OB_WIRE);
/* selection*/
WM_keymap_add_item(keymap, "VIEW3D_OT_select", SELECTMOUSE, KM_PRESS,
0, 0);
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
2009-01-16 23:53:11 UTC (rev 18542)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
2009-01-16 23:58:10 UTC (rev 18543)
@@ -1583,7 +1583,7 @@
prop= RNA_def_property(srna, identifier, PROP_INT, PROP_VECTOR);
if(len != 0) RNA_def_property_array(prop, len);
- RNA_def_property_int_array_default(prop, default_value);
+ if(default_value) RNA_def_property_int_array_default(prop,
default_value);
if(hardmin != hardmax) RNA_def_property_range(prop, hardmin, hardmax);
RNA_def_property_ui_text(prop, ui_name, ui_description);
RNA_def_property_ui_range(prop, softmin, softmax, 1, 3);
@@ -1598,7 +1598,7 @@
prop= RNA_def_property(srna, identifier, PROP_INT, PROP_NONE);
if(len != 0) RNA_def_property_array(prop, len);
- RNA_def_property_int_array_default(prop, default_value);
+ if(default_value) RNA_def_property_int_array_default(prop,
default_value);
if(hardmin != hardmax) RNA_def_property_range(prop, hardmin, hardmax);
RNA_def_property_ui_text(prop, ui_name, ui_description);
RNA_def_property_ui_range(prop, softmin, softmax, 1, 3);
@@ -1613,7 +1613,7 @@
prop= RNA_def_property(srna, identifier, PROP_STRING, PROP_NONE);
if(maxlen != 0) RNA_def_property_string_maxlength(prop, maxlen);
- RNA_def_property_string_default(prop, default_value);
+ if(default_value) RNA_def_property_string_default(prop, default_value);
RNA_def_property_ui_text(prop, ui_name, ui_description);
return prop;
@@ -1626,7 +1626,7 @@
prop= RNA_def_property(srna, identifier, PROP_STRING, PROP_FILEPATH);
if(maxlen != 0) RNA_def_property_string_maxlength(prop, maxlen);
- RNA_def_property_string_default(prop, default_value);
+ if(default_value) RNA_def_property_string_default(prop, default_value);
RNA_def_property_ui_text(prop, ui_name, ui_description);
return prop;
@@ -1639,7 +1639,7 @@
prop= RNA_def_property(srna, identifier, PROP_STRING, PROP_DIRPATH);
if(maxlen != 0) RNA_def_property_string_maxlength(prop, maxlen);
- RNA_def_property_string_default(prop, default_value);
+ if(default_value) RNA_def_property_string_default(prop, default_value);
RNA_def_property_ui_text(prop, ui_name, ui_description);
return prop;
@@ -1651,7 +1651,7 @@
PropertyRNA *prop;
prop= RNA_def_property(srna, identifier, PROP_ENUM, PROP_NONE);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
