diff options
| author | Peter Schlaile <peter@schlaile.de> | 2009-07-08 15:18:47 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2009-07-08 15:18:47 +0400 |
| commit | eb5f6f7d9320829ff61e9816b40d13a9664293d8 (patch) | |
| tree | 1b2c0fec7da8fe002385c99c8733ae14ba2b64e0 /source | |
| parent | a97b645a4455d332409a07a82e47182f72852360 (diff) | |
This fixes some NULL checks.
* base was referenced before NULL check
* ob wasn't checked for NULL
Still broken: Add Mesh doesn't seem to work in Object Mode.
But now it doesn't crash anymore...
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index af6cb887e71..90f6250cf8c 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -3261,7 +3261,7 @@ void ED_object_enter_editmode(bContext *C, int flag) { Scene *scene= CTX_data_scene(C); Base *base= CTX_data_active_base(C); - Object *ob= base->object; + Object *ob; ScrArea *sa= CTX_wm_area(C); View3D *v3d= NULL; int ok= 0; @@ -3273,7 +3273,10 @@ void ED_object_enter_editmode(bContext *C, int flag) v3d= sa->spacedata.first; if((v3d==NULL || (base->lay & v3d->lay))==0) return; - + + ob = base->object; + + if(ob==NULL) return; if(ob->data==NULL) return; if (object_data_is_libdata(ob)) { |