Revision: 19442
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19442
Author: campbellbarton
Date: 2009-03-29 06:34:20 +0200 (Sun, 29 Mar 2009)
Log Message:
-----------
- python api was returning incorrect int values from rna because it was using
PyLong_FromSize_t rather than PyLong_FromSsize_t, this messed up the default
values in documentation.
- renamed POSE_OT_select_hierarchy "add_to_sel" property to "extend"
- some property names were wrong (giving errors in the console at startup)
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
Modified:
branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
2009-03-29 02:15:13 UTC (rev 19441)
+++
branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
2009-03-29 04:34:20 UTC (rev 19442)
@@ -1440,7 +1440,7 @@
/* click-select */
// XXX for now, only leftmouse....
WM_keymap_add_item(keymap, "ANIM_OT_channels_mouseclick", LEFTMOUSE,
KM_PRESS, 0, 0);
- RNA_boolean_set(WM_keymap_add_item(keymap,
"ANIM_OT_channels_mouseclick", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr,
"select", 1);
+ RNA_boolean_set(WM_keymap_add_item(keymap,
"ANIM_OT_channels_mouseclick", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr,
"extend", 1);
RNA_boolean_set(WM_keymap_add_item(keymap,
"ANIM_OT_channels_mouseclick", LEFTMOUSE, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr,
"children_only", 1);
/* deselect all */
Modified:
branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
2009-03-29 02:15:13 UTC (rev 19441)
+++ branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c
2009-03-29 04:34:20 UTC (rev 19442)
@@ -186,17 +186,17 @@
kmi= WM_keymap_add_item(keymap, "ARMATURE_OT_select_hierarchy",
LEFTBRACKETKEY, KM_PRESS, 0, 0);
RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_PARENT);
- RNA_boolean_set(kmi->ptr, "add_to_sel", 0);
+ RNA_boolean_set(kmi->ptr, "extend", 0);
kmi= WM_keymap_add_item(keymap, "ARMATURE_OT_select_hierarchy",
LEFTBRACKETKEY, KM_PRESS, KM_SHIFT, 0);
RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_PARENT);
- RNA_boolean_set(kmi->ptr, "add_to_sel", 1);
+ RNA_boolean_set(kmi->ptr, "extend", 1);
kmi= WM_keymap_add_item(keymap, "ARMATURE_OT_select_hierarchy",
RIGHTBRACKETKEY, KM_PRESS, 0, 0);
RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_CHILD);
- RNA_boolean_set(kmi->ptr, "add_to_sel", 0);
+ RNA_boolean_set(kmi->ptr, "extend", 0);
kmi= WM_keymap_add_item(keymap, "ARMATURE_OT_select_hierarchy",
RIGHTBRACKETKEY, KM_PRESS, KM_SHIFT, 0);
RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_CHILD);
- RNA_boolean_set(kmi->ptr, "add_to_sel", 1);
+ RNA_boolean_set(kmi->ptr, "extend", 1);
WM_keymap_add_item(keymap, "ARMATURE_OT_select_linked", LKEY, KM_PRESS,
0, 0);
WM_keymap_add_item(keymap, "ARMATURE_OT_delete", XKEY, KM_PRESS, 0, 0);
@@ -232,17 +232,17 @@
kmi= WM_keymap_add_item(keymap, "POSE_OT_select_hierarchy",
LEFTBRACKETKEY, KM_PRESS, 0, 0);
RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_PARENT);
- RNA_boolean_set(kmi->ptr, "add_to_sel", 0);
+ RNA_boolean_set(kmi->ptr, "extend", 0);
kmi= WM_keymap_add_item(keymap, "POSE_OT_select_hierarchy",
LEFTBRACKETKEY, KM_PRESS, KM_SHIFT, 0);
RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_PARENT);
- RNA_boolean_set(kmi->ptr, "add_to_sel", 1);
+ RNA_boolean_set(kmi->ptr, "extend", 1);
kmi= WM_keymap_add_item(keymap, "POSE_OT_select_hierarchy",
RIGHTBRACKETKEY, KM_PRESS, 0, 0);
RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_CHILD);
- RNA_boolean_set(kmi->ptr, "add_to_sel", 0);
+ RNA_boolean_set(kmi->ptr, "extend", 0);
kmi= WM_keymap_add_item(keymap, "POSE_OT_select_hierarchy",
RIGHTBRACKETKEY, KM_PRESS, KM_SHIFT, 0);
RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_CHILD);
- RNA_boolean_set(kmi->ptr, "add_to_sel", 1);
+ RNA_boolean_set(kmi->ptr, "extend", 1);
WM_keymap_add_item(keymap, "POSE_OT_select_linked", LKEY, KM_PRESS, 0,
0);
}
Modified:
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-03-29 02:15:13 UTC (rev 19441)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-03-29 04:34:20 UTC (rev 19442)
@@ -3920,7 +3920,7 @@
bArmature *arm;
EditBone *curbone, *pabone, *chbone;
int direction = RNA_enum_get(op->ptr, "direction");
- int add_to_sel = RNA_boolean_get(op->ptr, "add_to_sel");
+ int add_to_sel = RNA_boolean_get(op->ptr, "extend");
ob= obedit;
arm= (bArmature *)ob->data;
Modified:
branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
2009-03-29 02:15:13 UTC (rev 19441)
+++ branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
2009-03-29 04:34:20 UTC (rev 19442)
@@ -452,7 +452,7 @@
bPoseChannel *pchan;
Bone *curbone, *pabone, *chbone;
int direction = RNA_enum_get(op->ptr, "direction");
- int add_to_sel = RNA_boolean_get(op->ptr, "add_to_sel");
+ int add_to_sel = RNA_boolean_get(op->ptr, "extend");
for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
curbone= pchan->bone;
@@ -519,7 +519,7 @@
/* props */
RNA_def_enum(ot->srna, "direction", direction_items,
BONE_SELECT_PARENT, "Direction", "");
- RNA_def_boolean(ot->srna, "add_to_sel", 0, "Add to Selection", "");
+ RNA_def_boolean(ot->srna, "extend", 0, "Add to Selection", "");
}
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
2009-03-29 02:15:13 UTC (rev 19441)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_compat.h
2009-03-29 04:34:20 UTC (rev 19442)
@@ -37,7 +37,7 @@
#undef PyUnicode_Check
#define PyUnicode_Check PyString_Check
-#define PyLong_FromSize_t PyInt_FromLong
+#define PyLong_FromSsize_t PyInt_FromLong
#define PyLong_AsSsize_t PyInt_AsLong
#undef PyLong_Check
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2009-03-29 02:15:13 UTC (rev 19441)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2009-03-29 04:34:20 UTC (rev 19442)
@@ -161,7 +161,7 @@
ret = PyBool_FromLong( RNA_property_boolean_get(ptr, prop) );
break;
case PROP_INT:
- ret = PyLong_FromSize_t( (size_t)RNA_property_int_get(ptr,
prop) );
+ ret = PyLong_FromSsize_t( (Py_ssize_t)RNA_property_int_get(ptr,
prop) );
break;
case PROP_FLOAT:
ret = PyFloat_FromDouble( RNA_property_float_get(ptr, prop) );
@@ -424,7 +424,7 @@
ret = PyBool_FromLong( RNA_property_boolean_get_index(ptr,
prop, index) );
break;
case PROP_INT:
- ret = PyLong_FromSize_t(
(size_t)RNA_property_int_get_index(ptr, prop, index) );
+ ret = PyLong_FromSsize_t(
(Py_ssize_t)RNA_property_int_get_index(ptr, prop, index) );
break;
case PROP_FLOAT:
ret = PyFloat_FromDouble( RNA_property_float_get_index(ptr,
prop, index) );
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
