[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24180] trunk/blender/source/blender/ editors/screen/screen_context.c: own commit r24178 broke adding objects, need to look into why but this fixes for now

[Campbell Barton]

Revision: 24180
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24180
Author:   campbellbarton
Date:     2009-10-30 14:26:29 +0100 (Fri, 30 Oct 2009)

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

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_context.c

Modified: trunk/blender/source/blender/editors/screen/screen_context.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_context.c	2009-10-30 13:08:58 UTC (rev 24179)
+++ trunk/blender/source/blender/editors/screen/screen_context.c	2009-10-30 13:26:29 UTC (rev 24180)
@@ -49,8 +49,15 @@
 	Scene *scene= sc->scene;
 	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 *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)) {
 		static const char *dir[] = {
@@ -243,7 +250,6 @@
 		}
 	}
 	else if(CTX_data_equals(member, "active_base")) {
-		base= CTX_data_active_base(C); /* not used in many places so get here */
 		if(base)
 			CTX_data_pointer_set(result, &scene->id, &RNA_UnknownType, base);