archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

own commit r24178 broke adding objects, need to look into why but this fixes for now

Browse Source
This commit is contained in:
Campbell Barton
2009-10-30 13:26:29 +00:00
parent 6f2ca7c2bf
commit 01f6dfaac9
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/screen/screen_context.c
View File

@@ -49,8 +49,15 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
Scene *scene= sc->scene; Scene *scene= sc->scene;
Base *base; Base *base;
#if 0 /* Using the context breaks adding objects in the UI. Need to find out why - campbell */
Object *obact= CTX_data_active_object(C); Object *obact= CTX_data_active_object(C);
Object *obedit= CTX_data_edit_object(C); Object *obedit= CTX_data_edit_object(C);
base= CTX_data_active_base(C);
#else
Object *obedit= scene->obedit;
Object *obact= OBACT;
base= BASACT;
#endif
if(CTX_data_dir(member)) { if(CTX_data_dir(member)) {
static const char *dir[] = { static const char *dir[] = {
@@ -243,7 +250,6 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
} }
} }
else if(CTX_data_equals(member, "active_base")) { else if(CTX_data_equals(member, "active_base")) {
base= CTX_data_active_base(C); /* not used in many places so get here */
if(base) if(base)
CTX_data_pointer_set(result, &scene->id, &RNA_UnknownType, base); CTX_data_pointer_set(result, &scene->id, &RNA_UnknownType, base);