[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58885] trunk/blender/source: 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.

[Campbell Barton]

Revision: 58885
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58885
Author:   campbellbarton
Date:     2013-08-03 23:58:17 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/editors/object/object_modifier.c
    trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
    trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.h

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2013-08-03 23:40:15 UTC (rev 58884)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2013-08-03 23:58:17 UTC (rev 58885)
@@ -530,7 +530,9 @@
 	}
 
 	/* 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 */

Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c	2013-08-03 23:40:15 UTC (rev 58884)
+++ trunk/blender/source/blender/editors/object/object_modifier.c	2013-08-03 23:58:17 UTC (rev 58885)
@@ -873,7 +873,7 @@
 	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;

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_tree.c	2013-08-03 23:40:15 UTC (rev 58884)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tree.c	2013-08-03 23:58:17 UTC (rev 58885)
@@ -86,11 +86,6 @@
 #include "outliner_intern.h"
 
 /* ********************************************************* */
-/* Defines */
-
-#define TS_CHUNK  128
-
-/* ********************************************************* */
 /* Persistent Data */
 
 static void outliner_storage_cleanup(SpaceOops *soops)

Modified: trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.h	2013-08-03 23:40:15 UTC (rev 58884)
+++ trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.h	2013-08-03 23:58:17 UTC (rev 58885)
@@ -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 @@
 
 #endif  /* WITH_PYTHON */
 
-#endif  /* __KX_POLYPROXY */
+#endif  /* __KX_POLYPROXY_H__ */