archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

last commit broke entering editmode

Browse Source
This commit is contained in:
Campbell Barton
2009-11-05 14:42:39 +00:00
parent 2907c6fdf0
commit 59eaa1ff50
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/object/object_edit.c
View File

@@ -383,9 +383,11 @@ void ED_object_enter_editmode(bContext *C, int flag)
v3d= sa->spacedata.first;
if((flag & EM_IGNORE_LAYER)==0) {
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 */
if(base==NULL) return;
else if(v3d && (base->lay & v3d->lay)==0) return;
else if(!v3d && (base->lay & scene->lay)==0) return;
}
else {
base= scene->basact;