From e47a41e3fc5299c1416487972297e7de69472f1b Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 9 Jan 2014 11:44:14 +1100
Subject: [PATCH] Code Cleanup: style

---
 source/blender/blenkernel/tracking_private.h            | 6 +++---
 source/blender/bmesh/tools/bmesh_bevel.c                | 4 +++-
 source/blender/compositor/intern/COM_ExecutionGroup.cpp | 2 +-
 source/blender/editors/mesh/editmesh_bisect.c           | 2 +-
 source/blender/editors/object/object_warp.c             | 2 +-
 source/blender/makesrna/intern/rna_rigidbody.c          | 5 +++--
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/source/blender/blenkernel/tracking_private.h b/source/blender/blenkernel/tracking_private.h
index 1a46b34c3b0..9d6c901c678 100644
--- a/source/blender/blenkernel/tracking_private.h
+++ b/source/blender/blenkernel/tracking_private.h
@@ -32,8 +32,8 @@
  * by multiple tracking files but which should not be public.
  */
 
-#ifndef __BKE_TRACKING_PRIVATE__
-#define __BKE_TRACKING_PRIVATE__
+#ifndef __TRACKING_PRIVATE__
+#define __TRACKING_PRIVATE__
 
 struct GHash;
 struct MovieTracking;
@@ -81,4 +81,4 @@ void tracking_set_marker_coords_from_tracking(int frame_width, int frame_height,
 void tracking_marker_insert_disabled(struct MovieTrackingTrack *track, const struct MovieTrackingMarker *ref_marker,
                                      bool before, bool overwrite);
 
-#endif  /* __BKE_TRACKING_PRIVATE__ */
+#endif  /* __TRACKING_PRIVATE__ */
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index b0198fd7638..0024e17f974 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -2437,8 +2437,10 @@ static bool tri_corner_test(BevelParams *bp, BevVert *bv)
 	}
 	angdiff = fabsf(totang - 3.0f * (float)M_PI_2);
 	if ((bp->pro_super_r == PRO_SQUARE_R && angdiff > (float)M_PI/16.0f) ||
-			angdiff > (float)M_PI_4)
+	    (angdiff > (float)M_PI_4))
+	{
 		return false;
+	}
 	return true;
 }
 
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
index a4ff1ce7a19..a2e4e809a3d 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
@@ -647,7 +647,7 @@ void ExecutionGroup::setRenderBorder(float xmin, float xmax, float ymin, float y
 	NodeOperation *operation = this->getOutputNodeOperation();
 
 	if (operation->isOutputOperation(true)) {
-		/* Basically, setting border need to happen for only operatoins
+		/* Basically, setting border need to happen for only operations
 		 * which operates in render resolution buffers (like compositor
 		 * output nodes).
 		 *
diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c
index 4b521516992..fe49d9ad000 100644
--- a/source/blender/editors/mesh/editmesh_bisect.c
+++ b/source/blender/editors/mesh/editmesh_bisect.c
@@ -176,7 +176,7 @@ static int mesh_bisect_modal(bContext *C, wmOperator *op, const wmEvent *event)
 
 	/* update or clear modal callout */
 	if (event->type == EVT_MODAL_MAP) {
-		if(event->val == GESTURE_MODAL_BEGIN) {
+		if (event->val == GESTURE_MODAL_BEGIN) {
 			ED_area_headerprint(CTX_wm_area(C), IFACE_("LMB: Release to confirm cut line"));
 		}
 		else {
diff --git a/source/blender/editors/object/object_warp.c b/source/blender/editors/object/object_warp.c
index 06b59a8e954..614939effcd 100644
--- a/source/blender/editors/object/object_warp.c
+++ b/source/blender/editors/object/object_warp.c
@@ -192,7 +192,7 @@ static int object_warp_verts_exec(bContext *C, wmOperator *op)
 
 
 	ED_transverts_create_from_obedit(&tvs, obedit, TM_ALL_JOINTS | TM_SKIP_HANDLES);
-	if (tvs.transverts == 0) {
+	if (tvs.transverts == NULL) {
 		return OPERATOR_CANCELLED;
 	}
 
diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c
index 58fc9ab25d4..b0a66ab2dc9 100644
--- a/source/blender/makesrna/intern/rna_rigidbody.c
+++ b/source/blender/makesrna/intern/rna_rigidbody.c
@@ -76,13 +76,14 @@ EnumPropertyItem rigidbody_constraint_type_items[] = {
 	{RBC_TYPE_MOTOR, "MOTOR", ICON_NONE, "Motor", "Drive rigid body around or along an axis"},
 	{0, NULL, 0, NULL, NULL}};
 
+#ifndef RNA_RUNTIME
 /* mesh source for collision shape creation */
-EnumPropertyItem rigidbody_mesh_source_items[] = {
+static EnumPropertyItem rigidbody_mesh_source_items[] = {
 	{RBO_MESH_BASE, "BASE", 0, "Base", "Base mesh"},
 	{RBO_MESH_DEFORM, "DEFORM", 0, "Deform", "Deformations (shaps keys, deform modifiers"},
 	{RBO_MESH_FINAL, "FINAL", 0, "Final", "All modifiers"},
 	{0, NULL, 0, NULL, NULL}};
-
+#endif
 
 #ifdef RNA_RUNTIME