diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 03:58:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-04 03:58:17 +0400 |
| commit | dd037a85a02b9344045c6f4cb8ff792827b69eff (patch) | |
| tree | e75ff5e3ac66cdea5c30ecb98d88e85aa6a0a3b3 | |
| parent | c3b9ec82d0cb1df9b88948e9ff02e2cb80cb89e1 (diff) | |
code cleanup: remove unused define, correct header guard mismatch, add NULL check so DM_to_mesh() can have a NULL object passed (currently not used) and remove redundant NULL check.
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 5 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_PolyProxy.h | 6 |
4 files changed, 7 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 3422f783eeb..8fedb425af1 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -530,7 +530,9 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob, CustomDataMask mask) } /* copy texture space */ - BKE_mesh_texspace_copy_from_object(&tmp, ob); + if (ob) { + BKE_mesh_texspace_copy_from_object(&tmp, ob); + } /* not all DerivedMeshes store their verts/edges/faces in CustomData, so * we set them here in case they are missing */ diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 651ee8b295a..03d51fcbe82 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -873,7 +873,7 @@ static int modifier_remove_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); Object *ob = ED_object_active_context(C); ModifierData *md = edit_modifier_property_get(op, ob, 0); - int mode_orig = ob ? ob->mode : 0; + int mode_orig = ob->mode; if (!md || !ED_object_modifier_remove(op->reports, bmain, ob, md)) return OPERATOR_CANCELLED; diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 49ff8e5dcf9..514bfc43ac7 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -86,11 +86,6 @@ #include "outliner_intern.h" /* ********************************************************* */ -/* Defines */ - -#define TS_CHUNK 128 - -/* ********************************************************* */ /* Persistent Data */ static void outliner_storage_cleanup(SpaceOops *soops) diff --git a/source/gameengine/Ketsji/KX_PolyProxy.h b/source/gameengine/Ketsji/KX_PolyProxy.h index f02aa90998e..837e7f8354c 100644 --- a/source/gameengine/Ketsji/KX_PolyProxy.h +++ b/source/gameengine/Ketsji/KX_PolyProxy.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_POLYROXY -#define __KX_POLYPROXY +#ifndef __KX_POLYPROXY_H__ +#define __KX_POLYPROXY_H__ #ifdef WITH_PYTHON @@ -82,4 +82,4 @@ public: #endif /* WITH_PYTHON */ -#endif /* __KX_POLYPROXY */ +#endif /* __KX_POLYPROXY_H__ */ |