[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28742] trunk/blender/source/blender/ editors/object/object_select.c: remove use of global 'G'

Campbell Barton ideasman42 at gmail.com
Thu May 13 00:47:37 CEST 2010


Revision: 28742
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28742
Author:   campbellbarton
Date:     2010-05-13 00:47:37 +0200 (Thu, 13 May 2010)

Log Message:
-----------
remove use of global 'G'

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_select.c

Modified: trunk/blender/source/blender/editors/object/object_select.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_select.c	2010-05-12 22:29:32 UTC (rev 28741)
+++ trunk/blender/source/blender/editors/object/object_select.c	2010-05-12 22:47:37 UTC (rev 28742)
@@ -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 @@
 	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 @@
 
 	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;
 	}





More information about the Bf-blender-cvs mailing list