diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-06 08:04:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-06 08:04:07 +0300 |
| commit | a0b134cd888ba481cae83328c8c7081dd1a5d18c (patch) | |
| tree | f783c67ec564b9feacd6aa411bcf3fdd2860922e /source/blender/editors/object | |
| parent | aafd32ab98c05a0bcd1916a2f02713490588e084 (diff) | |
bugfix [#25488] Game engine crash when try to run after blender app start
- also found other places where utf8 isnt ensured.
- remove duplicate NULL checks in object_edit.c
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index e8da5118532..7afb2983676 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -523,11 +523,11 @@ static int editmode_toggle_poll(bContext *C) /* covers proxies too */ if(ELEM(NULL, ob, ob->data) || ((ID *)ob->data)->lib) return 0; - - if (ob && (ob->restrictflag & OB_RESTRICT_VIEW)) + + if (ob->restrictflag & OB_RESTRICT_VIEW) return 0; - return ob && (ob->type == OB_MESH || ob->type == OB_ARMATURE || + return (ob->type == OB_MESH || ob->type == OB_ARMATURE || ob->type == OB_FONT || ob->type == OB_MBALL || ob->type == OB_LATTICE || ob->type == OB_SURF || ob->type == OB_CURVE); |