- use more inline math funcitons where possible

- swapped in less verbose math functons
- modifier include cleanup

5 files changed, 9 insertions, 5 deletions

diff --git a/source/blender/blenkernel/BKE_fluidsim.h b/source/blender/blenkernel/BKE_fluidsim.h
index da43ae7f28b..e730f4ec34c 100644
--- a/source/blender/blenkernel/BKE_fluidsim.h
+++ b/source/blender/blenkernel/BKE_fluidsim.h
@@ -34,6 +34,7 @@
 struct Object;
 struct Scene;
 struct FluidsimModifierData;
+struct FluidsimSettings;
 struct DerivedMesh;
 struct MVert;
 
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 84995b60f4b..065d747a959 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -46,6 +46,7 @@ struct BulletSoftBody;
 struct Group;
 struct bAction;
 struct RenderData;
+struct rctf;
 
 void clear_workob(struct Object *workob);
 void what_does_parent(struct Scene *scene, struct Object *ob, struct Object *workob);
diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h
index 4b6c5ba5459..47fb5049278 100644
--- a/source/blender/blenkernel/BKE_shrinkwrap.h
+++ b/source/blender/blenkernel/BKE_shrinkwrap.h
@@ -107,7 +107,7 @@ typedef struct ShrinkwrapCalcData
 
 	struct Object *ob;				//object we are applying shrinkwrap to
 
-	MVert *vert;					//Array of verts being projected (to fetch normals or other data)
+	struct MVert *vert;					//Array of verts being projected (to fetch normals or other data)
 	float (*vertexCos)[3];			//vertexs being shrinkwraped
 	int numVerts;
 
diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h
index 853fd99aa86..ef3ad3ad2e9 100644
--- a/source/blender/blenkernel/BKE_subsurf.h
+++ b/source/blender/blenkernel/BKE_subsurf.h
@@ -52,7 +52,7 @@ struct DerivedMesh *subsurf_make_derived_from_derived(
 						int useRenderParams, float (*vertCos)[3],
 						int isFinalCalc, int editMode);
 
-void subsurf_calculate_limit_positions(Mesh *me, float (*positions_r)[3]);
+void subsurf_calculate_limit_positions(struct Mesh *me, float (*positions_r)[3]);
 
 /**************************** Internal *****************************/
 
@@ -87,7 +87,7 @@ typedef struct CCGDerivedMesh {
 		int lvl, totlvl;
 		float (*orco)[3];
 
-		Object *ob;
+		struct Object *ob;
 		int modified;
 
 		void (*update)(DerivedMesh*);
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 0441e9c9d00..af0b462c349 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -1983,8 +1983,10 @@ static void pycon_id_looper (bConstraint *con, ConstraintIDFunc func, void *user
 /* Whether this approach is maintained remains to be seen (aligorith) */
 static void pycon_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstraintTarget *ct, float ctime)
 {
+#ifndef DISABLE_PYTHON
 	bPythonConstraint *data= con->data;
-	
+#endif
+
 	if (VALID_CONS_TARGET(ct)) {
 		/* special exception for curves - depsgraph issues */
 		if (ct->tar->type == OB_CURVE) {
@@ -3573,7 +3575,7 @@ static void shrinkwrap_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstr
 			}
 
 			/* co is in local object coordinates, change it to global and update target position */
-			mul_v3_m4v3(co, cob->matrix, co);
+			mul_m4_v3(cob->matrix, co);
 			VECCOPY(ct->matrix[3], co);
 		}
 	}