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

TransformOrientation enum is in the transform operators too, so we can't always cast to screen.

Browse Source
This commit is contained in:
Martin Poirier
2009-10-15 01:34:29 +00:00
parent 1da4a06fc7
commit 316d604daf
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/makesrna/intern/rna_space.c
View File

@@ -160,7 +160,7 @@ static PointerRNA rna_CurrentOrientation_get(PointerRNA *ptr)
EnumPropertyItem *rna_TransformOrientation_itemf(bContext *C, PointerRNA *ptr, int *free)
{
Scene *scene = ((bScreen*)ptr->id.data)->scene;
Scene *scene = NULL;
ListBase *transform_spaces;
TransformOrientation *ts= NULL;
EnumPropertyItem tmp = {0, "", 0, "", ""};
@@ -172,19 +172,26 @@ EnumPropertyItem *rna_TransformOrientation_itemf(bContext *C, PointerRNA *ptr, i
RNA_enum_items_add_value(&item, &totitem, transform_orientation_items, V3D_MANIP_LOCAL);
RNA_enum_items_add_value(&item, &totitem, transform_orientation_items, V3D_MANIP_VIEW);
if (ptr->type == &RNA_Space3DView)
scene = ((bScreen*)ptr->id.data)->scene;
else
scene = CTX_data_scene(C); /* can't use scene from ptr->id.data because that enum is also used by operators */
if(scene) {
transform_spaces = &scene->transform_spaces;
ts = transform_spaces->first;
}
if(ts)
{
RNA_enum_item_add_separator(&item, &totitem);
for(; ts; ts = ts->next) {
tmp.identifier = ts->name;
tmp.name= ts->name;
tmp.value = i++;
RNA_enum_item_add(&item, &totitem, &tmp);
for(; ts; ts = ts->next) {
tmp.identifier = ts->name;
tmp.name= ts->name;
tmp.value = i++;
RNA_enum_item_add(&item, &totitem, &tmp);
}
}
RNA_enum_item_end(&item, &totitem);