[Bf-blender-cvs] [6ee62ec] depsgraph_refactor: Depsgraph: Compilation error fixes for the strict compiler rules

[Sergey Sharybin]

Commit: 6ee62ec13a1534f846df6eefc821191fd89bb4ef
Author: Sergey Sharybin
Date:   Thu Dec 18 16:51:04 2014 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB6ee62ec13a1534f846df6eefc821191fd89bb4ef

Depsgraph: Compilation error fixes for the strict compiler rules

===================================================================

M	source/blender/blenkernel/intern/object.c
M	source/blender/blenkernel/intern/object_update.c
M	source/blender/depsgraph/intern/depsgraph_query.cpp
M	source/blender/depsgraph/intern/depsgraph_tag.cpp
M	source/blender/makesrna/intern/rna_depsgraph.c

===================================================================

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 613c85e..70e1954 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2314,6 +2314,9 @@ static void ob_parvert3(Object *ob, Object *par, float mat[4][4])
 	}
 }
 
+/* XXX: expose this in a proper header, or shuffle the code around to get it working */
+extern void ob_get_parent_matrix(Scene *scene, Object *ob, Object *par, float parentmat[4][4]);
+
 void ob_get_parent_matrix(Scene *scene, Object *ob, Object *par, float parentmat[4][4])
 {
 	float tmat[4][4];
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 26eb73f..d2c1f49 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -61,8 +61,8 @@
 
 #define PRINT if (DEG_get_eval_mode() == DEG_EVAL_MODE_NEW) printf
 
-void BKE_object_eval_local_transform(EvaluationContext *eval_ctx,
-                                     Scene *scene,
+void BKE_object_eval_local_transform(EvaluationContext *UNUSED(eval_ctx),
+                                     Scene *UNUSED(scene),
                                      Object *ob)
 {
 	PRINT("%s on %s\n", __func__, ob->id.name);
@@ -76,7 +76,7 @@ extern void ob_get_parent_matrix(Scene *scene, Object *ob, Object *par, float pa
 
 /* Evaluate parent */
 /* NOTE: based on solve_parenting(), but with the cruft stripped out */
-void BKE_object_eval_parent(EvaluationContext *eval_ctx, Scene *scene, Object *ob)
+void BKE_object_eval_parent(EvaluationContext *UNUSED(eval_ctx), Scene *scene, Object *ob)
 {
 	Object *par = ob->parent;
 	
@@ -106,7 +106,7 @@ void BKE_object_eval_parent(EvaluationContext *eval_ctx, Scene *scene, Object *o
 	}
 }
 
-void BKE_object_eval_constraints(EvaluationContext *eval_ctx,
+void BKE_object_eval_constraints(EvaluationContext *UNUSED(eval_ctx),
                                  Scene *scene,
                                  Object *ob)
 {
@@ -122,7 +122,7 @@ void BKE_object_eval_constraints(EvaluationContext *eval_ctx,
 	BKE_constraints_clear_evalob(cob);
 }
 
-void BKE_object_eval_done(EvaluationContext *eval_ctx, Object *ob)
+void BKE_object_eval_done(EvaluationContext *UNUSED(eval_ctx), Object *ob)
 {
 	PRINT("%s on %s\n", __func__, ob->id.name);
 	
@@ -287,8 +287,8 @@ void BKE_object_handle_data_update(EvaluationContext *eval_ctx,
 	/* quick cache removed */
 }
 
-void BKE_object_eval_uber_transform(EvaluationContext *eval_ctx,
-                                    Scene *scene,
+void BKE_object_eval_uber_transform(EvaluationContext *UNUSED(eval_ctx),
+                                    Scene *UNUSED(scene),
                                     Object *ob)
 {
 	/* TODO(sergey): Currently it's a duplicate of logic in BKE_object_handle_update_ex(). */
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cpp b/source/blender/depsgraph/intern/depsgraph_query.cpp
index 884bfec..23a6753 100644
--- a/source/blender/depsgraph/intern/depsgraph_query.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_query.cpp
@@ -102,7 +102,7 @@ static void DEG_graph_traverse_from_node(Depsgraph *graph, OperationDepsNode *st
 			/* ensure that relationship is not tagged for ignoring (i.e. cyclic, etc.) */
 			// TODO: cyclic refs should probably all get clustered towards the end, so that we can just stop on the first one
 			if ((rel->flag & DEPSREL_FLAG_CYCLIC) == 0) {
-				OperationDepsNode *child_node = rel->to;
+				OperationDepsNode *child_node = (OperationDepsNode *)rel->to;
 				
 				/* only visit node if the filtering function agrees */
 				if ((filter == NULL) || filter(graph, child_node, filter_data)) {			
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cpp b/source/blender/depsgraph/intern/depsgraph_tag.cpp
index 9ed8b0f..c2cd902 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cpp
@@ -125,7 +125,7 @@ void DEG_graph_flush_updates(Depsgraph *graph)
 		     ++it)
 		{
 			DepsRelation *rel = *it;
-			OperationDepsNode *to_node = rel->to;
+			OperationDepsNode *to_node = (OperationDepsNode *)rel->to;
 
 			if (!(to_node->flag & DEPSOP_FLAG_NEEDS_UPDATE)) {
 				to_node->flag |= DEPSOP_FLAG_NEEDS_UPDATE;
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c
index 66d59b6..9d152a7 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -70,10 +70,10 @@ static void rna_Depsgraph_debug_stats(Depsgraph *graph, ReportList *reports)
 	DEG_stats_simple(graph, &outer, &ops, &rels);
 	
 	// XXX: report doesn't seem to work
-	printf("Approx %u Operations, %u Relations, %u Outer Nodes\n",
+	printf("Approx %lu Operations, %lu Relations, %lu Outer Nodes\n",
 	       ops, rels, outer);
 		   
-	BKE_reportf(reports, RPT_WARNING, "Approx. %u Operations, %u Relations, %u Outer Nodes",
+	BKE_reportf(reports, RPT_WARNING, "Approx. %lu Operations, %lu Relations, %lu Outer Nodes",
 	            ops, rels, outer);
 }