[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24351] trunk/blender/source/blender/ editors/object/object_edit.c: last commit broke entering editmode

[Campbell Barton]

Revision: 24351
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24351
Author:   campbellbarton
Date:     2009-11-05 15:42:39 +0100 (Thu, 05 Nov 2009)

Log Message:
-----------
last commit broke entering editmode

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

Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c	2009-11-05 14:31:17 UTC (rev 24350)
+++ trunk/blender/source/blender/editors/object/object_edit.c	2009-11-05 14:42:39 UTC (rev 24351)
@@ -383,9 +383,11 @@
 		v3d= sa->spacedata.first;
 	
 	if((flag & EM_IGNORE_LAYER)==0) {
-		if(v3d && (base->lay & v3d->lay)==0) return;
+		base= CTX_data_active_base(C); /* active layer checked here for view3d */
+
+		if(base==NULL) return;
+		else if(v3d && (base->lay & v3d->lay)==0) return;
 		else if(!v3d && (base->lay & scene->lay)==0) return;
-		base= CTX_data_active_base(C); /* active layer checked here for view3d */
 	}
 	else {
 		base= scene->basact;