style cleanup: also correct some doxy comments

5 files changed, 22 insertions, 19 deletions

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 4963fe8899b..b04bd5bc47f 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1898,7 +1898,7 @@ void CustomData_copy_data(const CustomData *source, CustomData *dest,
 		 * (this should work because layers are ordered by type)
 		 */
 		while (dest_i < dest->totlayer && dest->layers[dest_i].type < source->layers[src_i].type) {
-			++dest_i;
+			dest_i++;
 		}
 
 		/* if there are no more dest layers, we're done */
@@ -1936,7 +1936,7 @@ void CustomData_copy_data(const CustomData *source, CustomData *dest,
 			 * we don't want to copy all source layers to the same dest, so
 			 * increment dest_i
 			 */
-			++dest_i;
+			dest_i++;
 		}
 	}
 }
@@ -1989,7 +1989,7 @@ void CustomData_interp(const CustomData *source, CustomData *dest,
 		 * (this should work because layers are ordered by type)
 		 */
 		while (dest_i < dest->totlayer && dest->layers[dest_i].type < source->layers[src_i].type) {
-			++dest_i;
+			dest_i++;
 		}
 
 		/* if there are no more dest layers, we're done */
@@ -2011,7 +2011,7 @@ void CustomData_interp(const CustomData *source, CustomData *dest,
 			 * we don't want to copy all source layers to the same dest, so
 			 * increment dest_i
 			 */
-			++dest_i;
+			dest_i++;
 		}
 	}
 
@@ -2401,7 +2401,7 @@ void CustomData_bmesh_copy_data(const CustomData *source, CustomData *dest,
 		 * (this should work because layers are ordered by type)
 		 */
 		while (dest_i < dest->totlayer && dest->layers[dest_i].type < source->layers[src_i].type) {
-			++dest_i;
+			dest_i++;
 		}
 
 		/* if there are no more dest layers, we're done */
@@ -2425,7 +2425,7 @@ void CustomData_bmesh_copy_data(const CustomData *source, CustomData *dest,
 			 * we don't want to copy all source layers to the same dest, so
 			 * increment dest_i
 			 */
-			++dest_i;
+			dest_i++;
 		}
 	}
 }
@@ -2637,7 +2637,7 @@ void CustomData_to_bmesh_block(const CustomData *source, CustomData *dest,
 		 * (this should work because layers are ordered by type)
 		 */
 		while (dest_i < dest->totlayer && dest->layers[dest_i].type < source->layers[src_i].type) {
-			++dest_i;
+			dest_i++;
 		}
 
 		/* if there are no more dest layers, we're done */
@@ -2661,7 +2661,7 @@ void CustomData_to_bmesh_block(const CustomData *source, CustomData *dest,
 			 * we don't want to copy all source layers to the same dest, so
 			 * increment dest_i
 			 */
-			++dest_i;
+			dest_i++;
 		}
 	}
 }
@@ -2680,7 +2680,7 @@ void CustomData_from_bmesh_block(const CustomData *source, CustomData *dest,
 		 * (this should work because layers are ordered by type)
 		 */
 		while (dest_i < dest->totlayer && dest->layers[dest_i].type < source->layers[src_i].type) {
-			++dest_i;
+			dest_i++;
 		}
 
 		/* if there are no more dest layers, we're done */
@@ -2704,7 +2704,7 @@ void CustomData_from_bmesh_block(const CustomData *source, CustomData *dest,
 			 * we don't want to copy all source layers to the same dest, so
 			 * increment dest_i
 			 */
-			++dest_i;
+			dest_i++;
 		}
 	}
 
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index b22e24e15d4..1b53f8980cb 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -570,12 +570,14 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O
 
 	/* softbody collision  */
 	if ((ob->type == OB_MESH) || (ob->type == OB_CURVE) || (ob->type == OB_LATTICE)) {
-		if (modifiers_isModifierEnabled(ob, eModifierType_Softbody) 
-			|| modifiers_isModifierEnabled(ob, eModifierType_Cloth)
-			|| modifiers_isModifierEnabled(ob, eModifierType_Smoke)
-			|| modifiers_isModifierEnabled(ob, eModifierType_DynamicPaint)
-			|| ob->particlesystem.first)
+		if (ob->particlesystem.first ||
+			modifiers_isModifierEnabled(ob, eModifierType_Softbody) ||
+			modifiers_isModifierEnabled(ob, eModifierType_Cloth) ||
+			modifiers_isModifierEnabled(ob, eModifierType_Smoke) ||
+			modifiers_isModifierEnabled(ob, eModifierType_DynamicPaint))
+		{
 			dag_add_collision_field_relation(dag, scene, ob, node);  /* TODO: use effectorweight->group */
+		}
 	}
 	
 	/* object data drivers */
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 8de9640eb35..b2a9e229be9 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -1764,8 +1764,7 @@ void do_versions_ipos_to_animato(Main *main)
 					for (act = ob->actuators.first; act; act = act->next) {
 						/* Any actuators set to ACT_IPO at this point are actually Action Actuators that
 						   need this converted IPO to finish converting the actuator. */
-						if (act->type == ACT_IPO)
-						{
+						if (act->type == ACT_IPO) {
 							aa = (bActionActuator*)act->data;
 							aa->act = ob->adt->action;
 							act->type = ACT_ACTION;
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 60be0a60dcb..17a3c595ea7 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -1449,6 +1449,8 @@ KeyBlock *add_keyblock(Key *key, const char *name)
  * \note sorting is a problematic side effect in some cases,
  * better only do this explicitly by having its own function,
  *
+ * \param key The key datablock to add to.
+ * \param name Optional name for the new keyblock.
  * \param do_force always use ctime even for relative keys.
  */
 KeyBlock *add_keyblock_ctime(Key *key, const char *name, const short do_force)
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 21811c19d24..e5f392e4bce 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -779,7 +779,7 @@ void assign_material(Object *ob, Material *ma, short act, int assign_type)
 	Material *mao, **matar, ***matarar;
 	char *matbits;
 	short *totcolp;
-	char bit=0;
+	char bit = 0;
 
 	if (act > MAXMAT) return;
 	if (act < 1) act = 1;
@@ -813,7 +813,7 @@ void assign_material(Object *ob, Material *ma, short act, int assign_type)
 		bit = ob->matbits[ob->actcol - 1];
 	}
 	else {
-		switch(assign_type) {
+		switch (assign_type) {
 			case BKE_MAT_ASSIGN_OBDATA:
 				bit = 0;
 				break;