[Bf-blender-cvs] [600c4e86d15] temp-fracture-modifier-2.8: compile fixes for windows

[Martin Felke]

Commit: 600c4e86d15c229a236d0dce9556bde1b083d203
Author: Martin Felke
Date:   Sun Aug 26 00:04:55 2018 +0200
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rB600c4e86d15c229a236d0dce9556bde1b083d203

compile fixes for windows

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

M	source/blender/blenkernel/intern/fracture.c
M	source/blender/blenkernel/intern/fracture_rigidbody.c
M	source/blender/blenkernel/intern/pointcache.c

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

diff --git a/source/blender/blenkernel/intern/fracture.c b/source/blender/blenkernel/intern/fracture.c
index 53cf585bb47..a9719a3611b 100644
--- a/source/blender/blenkernel/intern/fracture.c
+++ b/source/blender/blenkernel/intern/fracture.c
@@ -464,8 +464,8 @@ static Mesh* get_mesh(Mesh** meshes, int index, Mesh* mesh)
 static void process_cells(FractureModifierData* fmd, MeshIsland* mi, Main* bmain, Object* ob, Scene* scene, cell *c, int count)
 {
 	int i, j = 1;
-	BisectContext bictx = {};
-	BooleanContext boctx = {};
+	BisectContext bictx = {0};
+	BooleanContext boctx = {0};
 	MeshIsland** islands = NULL;
 	KDTree *tree = NULL;
 	Mesh** temp_meshs = NULL;
@@ -873,7 +873,7 @@ void intersect_mesh_by_mesh(FractureModifierData* fmd, Object* ob, Mesh* meA, Me
 {
 	int i = 0;
 	Mesh* outA = NULL, *outB = NULL;
-	BooleanContext boctx = {};
+	BooleanContext boctx = {0};
 	prepare_boolean(fmd, ob, &boctx);
 
 	if (ELEM(fmd->keep_cutter_shards, MOD_FRACTURE_KEEP_BOTH, MOD_FRACTURE_KEEP_INTERSECT)) {
@@ -1290,7 +1290,7 @@ void BKE_fracture_clear_cache(FractureModifierData* fmd, Object* ob, Scene *scen
 				int frame = (int)BKE_scene_frame_get(scene);
 
 				//mi->rigidbody->flag |= (RBO_FLAG_NEEDS_VALIDATE | RBO_FLAG_NEEDS_RESHAPE);
-				BKE_rigidbody_validate_sim_shard(rbw, ob, mi, fmd, true, true, size, frame);
+				BKE_rigidbody_validate_sim_shard(rbw, mi, ob, fmd, true, true, size, frame);
 			}
 
 			mi = mi->next;
@@ -2201,7 +2201,7 @@ FracPointCloud BKE_fracture_points_get(Depsgraph *depsgraph, FractureModifierDat
 	}
 
 	if (emd->point_source & (MOD_FRACTURE_OWN_VERTS | MOD_FRACTURE_EXTRA_VERTS)) {
-		points_from_verts(go, totgroup, &points, ob->obmat, thresh, emd, mi, ob);
+		points_from_verts(go, totgroup, &points, ob->obmat, thresh, emd, ob, mi);
 	}
 
 #if 0
@@ -2676,7 +2676,7 @@ void BKE_fracture_do(FractureModifierData *fmd, MeshIsland *mi, Object *obj, Dep
 			}
 
 			/*decouple from listbase because it will continue growing ... */
-			for (mi = mi_tmp, i = 0; i < count; i++)
+			for (i = 0; i < count; i++)
 			{
 				BKE_fracture_points(fmd, obj, mi_tmp[i], depsgraph, bmain, scene);
 				mi_tmp[i]->endframe = frame;
@@ -2719,7 +2719,7 @@ static void mesh_separate_tagged(FractureModifierData *fmd, Object *ob, BMVert**
 	BMesh *bm_new;
 	BMesh *bm_old = bm_work;
 	Mesh *me = NULL;
-	struct BMeshCreateParams bmc = {};
+	struct BMeshCreateParams bmc = {0};
 	bmc.use_toolflags = true;
 
 	bm_new = BM_mesh_create(&bm_mesh_allocsize_default, &bmc);
diff --git a/source/blender/blenkernel/intern/fracture_rigidbody.c b/source/blender/blenkernel/intern/fracture_rigidbody.c
index 26fd6f4d305..7aeb7645292 100644
--- a/source/blender/blenkernel/intern/fracture_rigidbody.c
+++ b/source/blender/blenkernel/intern/fracture_rigidbody.c
@@ -1211,7 +1211,7 @@ int BKE_rigidbody_filter_callback(void* scene, void* island1, void* island2, voi
 	bool validOb = true, check_activate = false;
 
 	// oh man... the pleasures of CoW.., mooo
-	sc_orig = DEG_get_original_id(sc);
+	sc_orig = (Scene*)DEG_get_original_id(&sc->id);
 	rbw = sc_orig->rigidbody_world;
 
 	mi1 = (MeshIsland*)island1;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 92702a72a51..38f4eedcf66 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1330,7 +1330,7 @@ static int  ptcache_rigidbody_write(int index, void *rb_v, void **data, int cfra
 	RigidBodyWorld *rbw = rb_v;
 	RigidBodyOb *rbo = NULL;
 	Object* ob = rbw->objects[index];
-	FractureModifierData *fmd = modifiers_findByType(ob, eModifierType_Fracture);
+	FractureModifierData *fmd = (FractureModifierData*)modifiers_findByType(ob, eModifierType_Fracture);
 
 	if (!fmd) {
 		rbo = ob->rigidbody_object;
@@ -1401,7 +1401,7 @@ static void ptcache_rigidbody_read(int index, void *rb_v, void **data, float cfr
 	RigidBodyWorld *rbw = rb_v;
 	RigidBodyOb *rbo = NULL;
 	Object* ob = rbw->objects[index];
-	FractureModifierData *fmd = modifiers_findByType(ob, eModifierType_Fracture);
+	FractureModifierData *fmd = (FractureModifierData*)modifiers_findByType(ob, eModifierType_Fracture);
 
 	if (!fmd) {
 		rbo = ob->rigidbody_object;
@@ -1449,7 +1449,7 @@ static void ptcache_rigidbody_interpolate(int index, void *rb_v, void **data, fl
 	RigidBodyWorld *rbw = rb_v;
 	RigidBodyOb *rbo = NULL;
 	Object* ob = rbw->objects[index];
-	FractureModifierData *fmd = modifiers_findByType(ob, eModifierType_Fracture);
+	FractureModifierData *fmd = (FractureModifierData*)modifiers_findByType(ob, eModifierType_Fracture);
 	ParticleKey keys[4], result;
 	float dfra;