Revision: 24479
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24479
Author: campbellbarton
Date: 2009-11-11 10:16:53 +0100 (Wed, 11 Nov 2009)
Log Message:
-----------
- In the context, EditBones and Bases were set as 'RNA_UnknownType', replaced
with propper types.
- renamed RNA_Base to RNA_ObjectBase
- only include id_data for the python api's autocomplete if it has an ID type
set.
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/source/blender/editors/screen/screen_context.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py 2009-11-11 09:11:21 UTC
(rev 24478)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2009-11-11 09:16:53 UTC
(rev 24479)
@@ -26,8 +26,9 @@
def copy(self):
new_context = {}
+ generic_keys = StructRNA.__dict__.keys()
for item in dir(self):
- if item not in StructRNA.__dict__ and item != "id_data":
+ if item not in generic_keys:
new_context[item] = getattr(self, item)
return new_context
Modified: trunk/blender/source/blender/editors/screen/screen_context.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_context.c
2009-11-11 09:11:21 UTC (rev 24478)
+++ trunk/blender/source/blender/editors/screen/screen_context.c
2009-11-11 09:16:53 UTC (rev 24479)
@@ -84,7 +84,7 @@
if(selected_objects)
CTX_data_id_list_add(result,
&base->object->id);
else
- CTX_data_list_add(result, &scene->id,
&RNA_UnknownType, base);
+ CTX_data_list_add(result, &scene->id,
&RNA_ObjectBase, base);
}
}
@@ -100,7 +100,7 @@
if(selected_editable_objects)
CTX_data_id_list_add(result, &base->object->id);
else
-
CTX_data_list_add(result, &scene->id, &RNA_UnknownType, base);
+
CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
}
}
}
@@ -131,18 +131,18 @@
if (editable_bones) {
/* only selected + editable */
if (EBONE_EDITABLE(ebone)) {
-
CTX_data_list_add(result, &arm->id, &RNA_UnknownType, ebone);
+
CTX_data_list_add(result, &arm->id, &RNA_EditBone, ebone);
if ((flipbone) &&
!(flipbone->flag & BONE_SELECTED))
-
CTX_data_list_add(result, &arm->id, &RNA_UnknownType, flipbone);
+
CTX_data_list_add(result, &arm->id, &RNA_EditBone, flipbone);
}
}
else {
/* only include bones if
visible */
- CTX_data_list_add(result,
&arm->id, &RNA_UnknownType, ebone);
+ CTX_data_list_add(result,
&arm->id, &RNA_EditBone, ebone);
if ((flipbone) &&
EBONE_VISIBLE(arm, flipbone)==0)
-
CTX_data_list_add(result, &arm->id, &RNA_UnknownType, flipbone);
+
CTX_data_list_add(result, &arm->id, &RNA_EditBone, flipbone);
}
}
}
@@ -173,18 +173,18 @@
if (selected_editable_bones) {
/* only selected + editable */
if (EBONE_EDITABLE(ebone)) {
-
CTX_data_list_add(result, &arm->id, &RNA_UnknownType, ebone);
+
CTX_data_list_add(result, &arm->id, &RNA_EditBone, ebone);
if ((flipbone) &&
!(flipbone->flag & BONE_SELECTED))
-
CTX_data_list_add(result, &arm->id, &RNA_UnknownType, flipbone);
+
CTX_data_list_add(result, &arm->id, &RNA_EditBone, flipbone);
}
}
else {
/* only include bones if
selected */
- CTX_data_list_add(result,
&arm->id, &RNA_UnknownType, ebone);
+ CTX_data_list_add(result,
&arm->id, &RNA_EditBone, ebone);
if ((flipbone) &&
!(flipbone->flag & BONE_SELECTED))
-
CTX_data_list_add(result, &arm->id, &RNA_UnknownType, flipbone);
+
CTX_data_list_add(result, &arm->id, &RNA_EditBone, flipbone);
}
}
}
@@ -251,7 +251,7 @@
}
else if(CTX_data_equals(member, "active_base")) {
if(base)
- CTX_data_pointer_set(result, &scene->id,
&RNA_UnknownType, base);
+ CTX_data_pointer_set(result, &scene->id,
&RNA_ObjectBase, base);
return 1;
}
Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c
2009-11-11 09:11:21 UTC (rev 24478)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c
2009-11-11 09:16:53 UTC (rev 24479)
@@ -676,7 +676,7 @@
if(selected_objects)
CTX_data_id_list_add(result,
&base->object->id);
else
- CTX_data_list_add(result,
&scene->id, &RNA_UnknownType, base);
+ CTX_data_list_add(result,
&scene->id, &RNA_ObjectBase, base);
}
}
}
@@ -693,7 +693,7 @@
if(selected_editable_objects)
CTX_data_id_list_add(result, &base->object->id);
else
-
CTX_data_list_add(result, &scene->id, &RNA_UnknownType, base);
+
CTX_data_list_add(result, &scene->id, &RNA_ObjectBase, base);
}
}
}
@@ -710,7 +710,7 @@
if(visible_objects)
CTX_data_id_list_add(result,
&base->object->id);
else
- CTX_data_list_add(result,
&scene->id, &RNA_UnknownType, base);
+ CTX_data_list_add(result,
&scene->id, &RNA_ObjectBase, base);
}
}
}
@@ -726,7 +726,7 @@
if(selectable_objects)
CTX_data_id_list_add(result,
&base->object->id);
else
- CTX_data_list_add(result,
&scene->id, &RNA_UnknownType, base);
+ CTX_data_list_add(result,
&scene->id, &RNA_ObjectBase, base);
}
}
}
@@ -736,7 +736,7 @@
else if(CTX_data_equals(member, "active_base")) {
if(scene->basact && (scene->basact->lay & lay))
if((scene->basact->object->restrictflag &
OB_RESTRICT_VIEW)==0)
- CTX_data_pointer_set(result, &scene->id,
&RNA_UnknownType, scene->basact);
+ CTX_data_pointer_set(result, &scene->id,
&RNA_ObjectBase, scene->basact);
return 1;
}
Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_access.h 2009-11-11 09:11:21 UTC
(rev 24478)
+++ trunk/blender/source/blender/makesrna/RNA_access.h 2009-11-11 09:16:53 UTC
(rev 24479)
@@ -315,6 +315,7 @@
extern StructRNA RNA_NorController;
extern StructRNA RNA_Nurb;
extern StructRNA RNA_Object;
+extern StructRNA RNA_ObjectBase;
extern StructRNA RNA_ObstacleFluidSettings;
extern StructRNA RNA_Operator;
extern StructRNA RNA_OperatorFileListElement;
Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c 2009-11-11
09:11:21 UTC (rev 24478)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c 2009-11-11
09:16:53 UTC (rev 24479)
@@ -1763,7 +1763,7 @@
StructRNA *srna;
PropertyRNA *prop;
- srna= RNA_def_struct(brna, "Base", NULL);
+ srna= RNA_def_struct(brna, "ObjectBase", NULL);
RNA_def_struct_sdna(srna, "Base");
RNA_def_struct_ui_text(srna, "Object Base", "An objects instance in a
scene.");
RNA_def_struct_ui_icon(srna, ICON_OBJECT_DATA);
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2009-11-11
09:11:21 UTC (rev 24478)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2009-11-11
09:16:53 UTC (rev 24479)
@@ -2221,12 +2221,12 @@
/* Bases/Objects */
prop= RNA_def_property(srna, "bases", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "base", NULL);
- RNA_def_property_struct_type(prop, "Base");
+ RNA_def_property_struct_type(prop, "ObjectBase");
RNA_def_property_ui_text(prop, "Bases", "");
{ /* Collection active property */
prop_act= RNA_def_property(srna, "base_active", PROP_POINTER,
PROP_NONE);
- RNA_def_property_struct_type(prop_act, "Base");
+ RNA_def_property_struct_type(prop_act, "ObjectBase");
RNA_def_property_pointer_sdna(prop_act, NULL, "basact");
RNA_def_property_flag(prop_act, PROP_EDITABLE);
RNA_def_property_ui_text(prop_act, "Active Base", "Active
object in the scene.");
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2009-11-11
09:11:21 UTC (rev 24478)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2009-11-11
09:16:53 UTC (rev 24479)
@@ -1349,7 +1349,7 @@
}
/* Hard coded names */
- {
+ if(self->ptr.id.data) {
pystring = PyUnicode_FromString("id_data");
PyList_Append(ret, pystring);
Py_DECREF(pystring);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
