2.5

From the anti-globalization department: 
G.obedit terminated!

Wherever possible, use CTX_data_edit_object(C) to get this
now. It's stored in scene now, and the screen context has
it defined.

1 files changed, 7 insertions, 7 deletions

diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 1949db88d28..1986203f839 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1018,10 +1018,10 @@ short view3d_opengl_select(ViewContext *vc, unsigned int *buffer, unsigned int b
 	glPushName(-1);
 	code= 1;
 	
-	if(G.obedit && G.obedit->type==OB_MBALL) {
+	if(vc->obedit && vc->obedit->type==OB_MBALL) {
 		draw_object(scene, ar, v3d, BASACT, DRAW_PICKING|DRAW_CONSTCOLOR);
 	}
-	else if ((G.obedit && G.obedit->type==OB_ARMATURE)) {
+	else if ((vc->obedit && vc->obedit->type==OB_ARMATURE)) {
 		draw_object(scene, ar, v3d, BASACT, DRAW_PICKING|DRAW_CONSTCOLOR);
 	}
 	else {
@@ -1139,13 +1139,13 @@ void initlocalview(Scene *scene, ARegion *ar, View3D *v3d)
 		ok= 0;
 	}
 	else {
-		if(G.obedit) {
-			minmax_object(G.obedit, min, max);
+		if(scene->obedit) {
+			minmax_object(scene->obedit, min, max);
 			
 			ok= 1;
 		
 			BASACT->lay |= locallay;
-			G.obedit->lay= BASACT->lay;
+			scene->obedit->lay= BASACT->lay;
 		}
 		else {
 			base= FIRSTBASE;
@@ -1203,7 +1203,7 @@ void initlocalview(Scene *scene, ARegion *ar, View3D *v3d)
 			if( base->lay & locallay ) {
 				base->lay-= locallay;
 				if(base->lay==0) base->lay= v3d->layact;
-				if(base->object != G.obedit) base->flag |= SELECT;
+				if(base->object != scene->obedit) base->flag |= SELECT;
 				base->object->lay= base->lay;
 			}
 			base= base->next;
@@ -1260,7 +1260,7 @@ void endlocalview(Scene *scene, ScrArea *sa)
 			if( base->lay & locallay ) {
 				base->lay-= locallay;
 				if(base->lay==0) base->lay= v3d->layact;
-				if(base->object != G.obedit) {
+				if(base->object != scene->obedit) {
 					base->flag |= SELECT;
 					base->object->flag |= SELECT;
 				}