[Bf-blender-cvs] [241a9b5] master: Fix T40823 LoD Add and Remove crash without valid object
Daniel Stokes
noreply at git.blender.org
Wed Jul 2 15:13:39 CEST 2014
Commit: 241a9b5c6e9f272b17adee8c09ed454637e13879
Author: Daniel Stokes
Date: Wed Jul 2 06:09:50 2014 -0700
https://developer.blender.org/rB241a9b5c6e9f272b17adee8c09ed454637e13879
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.
===================================================================
M source/blender/blenkernel/intern/object.c
M source/blender/editors/object/object_lod.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index f72fd1f..415606d 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 a7cc413..8bcbba6 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;
More information about the Bf-blender-cvs
mailing list