diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-11-05 17:42:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-11-05 17:42:39 +0300 |
| commit | 59eaa1ff50e6b6c94a55ccac934cea283eae1659 (patch) | |
| tree | 810a6bcf2c5667792965d1f12aea3b85398a9266 /source/blender/editors | |
| parent | 2907c6fdf09a92dfb6723f075e03aab2f24c289d (diff) | |
last commit broke entering editmode
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 371d87260cd..0cfdd914222 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -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; |