[Bf-blender-cvs] [3d5149b6d7] snap_system_clip_planes: Fix building on linux (gcc).

Bastien Montagne noreply at git.blender.org
Fri Feb 24 16:48:10 CET 2017


Commit: 3d5149b6d71c53188f9da4b2de199afc36e6114e
Author: Bastien Montagne
Date:   Fri Feb 24 16:47:43 2017 +0100
Branches: snap_system_clip_planes
https://developer.blender.org/rB3d5149b6d71c53188f9da4b2de199afc36e6114e

Fix building on linux (gcc).

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

M	source/blender/blenlib/intern/BLI_kdopbvh.c
M	source/blender/editors/transform/transform_snap_object.c
M	source/blenderplayer/bad_level_call_stubs/stubs.c

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

diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index b3f107151a..cfe0e037ca 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -1980,7 +1980,7 @@ static bool bvhtree_walk_dfs_recursive(
 		return walk_leaf_cb((const BVHTreeAxisRange *)node->bv, node->index, parent_flag, userdata);
 	}
 	else {
-		short i;
+		int i;
 		/* First pick the closest node to recurse into */
 		if (walk_order_cb((const BVHTreeAxisRange *)node->bv, node->main_axis, parent_flag, userdata)) {
 			for (i = 0; i != node->totnode; i++) {
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index 63aa00f1f8..e710a7aab0 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -23,6 +23,7 @@
  */
 
 #include <stdlib.h>
+#include <limits.h>
 #include <math.h>
 #include <float.h>
 #include <stdio.h>
@@ -1590,9 +1591,9 @@ static bool snapCamera(
 
 static const BVHTreeFromMesh *G_treedata = NULL;
 static uint G_ed_num = 0;
-static void G_test_ed(char *func) {
+static void G_test_ed(const char *pre, const char *func, const char *post) {
 	if (G_treedata && G_treedata->edge) {
-		printf("%s\n", func);
+		printf("%s%s%s\n", pre, func, post);
 		printf("edge_allocated = %s\n", G_treedata->edge_allocated ? "True" : "False");
 		const MEdge *ed = &G_treedata->edge[G_ed_num - 1];
 		printf("reading edge %d:\n", G_ed_num - 1);
@@ -1871,7 +1872,7 @@ static bool snapDerivedMesh(
 
 			G_treedata = treedata_lt;
 			G_ed_num = dm->getNumEdges(dm);
-			G_test_ed("***start***\n"__func__);
+			G_test_ed("***start***\n", __func__, "");
 
 			copy_v3_v3(r_loc, neasrest2d.co);
 			mul_m4_v3(obmat, r_loc);
@@ -1889,9 +1890,9 @@ static bool snapDerivedMesh(
 		}
 	}
 
-	G_test_ed(__func__": before release");
+	G_test_ed("", __func__, ": before release");
 	dm->release(dm);
-	G_test_ed(__func__": after release :(");
+	G_test_ed("", __func__, ": after release :(");
 
 	return retval;
 }
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 08d00e9148..59c459a660 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -548,10 +548,9 @@ SnapObjectContext *ED_transform_snap_object_context_create_view3d(
 void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx) RET_NONE
 bool ED_transform_snap_object_project_ray_ex(
         struct SnapObjectContext *sctx,
-        const unsigned short snap_to,
         const struct SnapObjectParams *params,
-        const float ray_start[3], const float ray_normal[3], float *ray_depth,
-        /* return args */
+        const float ray_start[3], const float ray_normal[3],
+        float *ray_depth,
         float r_loc[3], float r_no[3], int *r_index,
         struct Object **r_ob, float r_obmat[4][4]) RET_ZERO




More information about the Bf-blender-cvs mailing list