diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-05-13 02:47:37 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-05-13 02:47:37 +0400 |
| commit | db0733eb12c86987cb9aa2786d7313cfc12d617d (patch) | |
| tree | 8951d5f138fe8c559999f50f5964247394f3e42c /source/blender/editors/object/object_select.c | |
| parent | d0802b4db29a888515b20b7b1976be67f1537f90 (diff) | |
remove use of global 'G'
Diffstat (limited to 'source/blender/editors/object/object_select.c')
| -rw-r--r-- | source/blender/editors/object/object_select.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 47168d2b9c0..f1a906f36dd 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -45,7 +45,6 @@ #include "BKE_context.h" #include "BKE_depsgraph.h" -#include "BKE_global.h" #include "BKE_group.h" #include "BKE_main.h" #include "BKE_material.h" @@ -409,8 +408,7 @@ static short select_grouped_group(bContext *C, Object *ob) /* Select objects in uiPopupMenu *pup; uiLayout *layout; - // XXX G.main ? - for (group=G.main->group.first; group && group_count < GROUP_MENU_MAX; group=group->id.next) { + for (group=CTX_data_main(C)->group.first; group && group_count < GROUP_MENU_MAX; group=group->id.next) { if (object_in_group (ob, group)) { ob_groups[group_count] = group; group_count++; @@ -788,8 +786,7 @@ static int object_select_same_group_exec(bContext *C, wmOperator *op) RNA_string_get(op->ptr, "group", group_name); - // XXX G.main ? - for (group=G.main->group.first; group; group=group->id.next) { + for (group=CTX_data_main(C)->group.first; group; group=group->id.next) { if (!strcmp(group->id.name, group_name)) break; } |