diff options
author | Daniel Stokes <kupomail@gmail.com> | 2014-07-02 17:09:50 +0400 |
---|---|---|
committer | Daniel Stokes <kupomail@gmail.com> | 2014-07-02 17:12:31 +0400 |
commit | 241a9b5c6e9f272b17adee8c09ed454637e13879 (patch) | |
tree | 280c8d3574c8f346c522b44863f4382cc331fdc9 | |
parent | 259a4361973c7e1b912b9fcded3ed02bf9ab0b96 (diff) |
Fix T40823 LoD Add and Remove crash without valid object
Changed the polling method used for both the add and remove LoD operators
to a more appropriate one.
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 3 | ||||
-rw-r--r-- | source/blender/editors/object/object_lod.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index f72fd1f645d..415606d1fdc 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1083,9 +1083,6 @@ void BKE_object_lod_sort(Object *ob) bool BKE_object_lod_remove(Object *ob, int level) { LodLevel *rem; - - if (ob == NULL) - return false; if (level < 1 || level > BLI_countlist(&ob->lodlevels) - 1) return false; diff --git a/source/blender/editors/object/object_lod.c b/source/blender/editors/object/object_lod.c index a7cc4131a96..8bcbba6be96 100644 --- a/source/blender/editors/object/object_lod.c +++ b/source/blender/editors/object/object_lod.c @@ -69,7 +69,7 @@ void OBJECT_OT_lod_add(wmOperatorType *ot) /* api callbacks */ ot->exec = object_lod_add_exec; - ot->poll = ED_operator_objectmode; + ot->poll = ED_operator_object_active; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; @@ -101,7 +101,7 @@ void OBJECT_OT_lod_remove(wmOperatorType *ot) /* api callbacks */ ot->exec = object_lod_remove_exec; - ot->poll = ED_operator_objectmode; + ot->poll = ED_operator_object_active; /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; |