[Bf-blender-cvs] [f3ce2881c3d] fracture_modifier: fix a clang warning, fix an improper initialisation for gcc, remove nonfunctional omp, rise BM_OMPLIMIT to avoid overheads with small datasets

Jens Verwiebe noreply at git.blender.org
Wed May 2 20:44:22 CEST 2018


Commit: f3ce2881c3d84fc58b91a98816982598e108c693
Author: Jens Verwiebe
Date:   Wed May 2 20:41:56 2018 +0200
Branches: fracture_modifier
https://developer.blender.org/rBf3ce2881c3d84fc58b91a98816982598e108c693

fix a clang warning, fix an improper initialisation for gcc, remove nonfunctional omp, rise BM_OMPLIMIT to avoid overheads with small datasets

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

M	intern/rigidbody/RBI_api.h
M	source/blender/blenkernel/intern/rigidbody.c
M	source/blender/modifiers/intern/MOD_remesh.c

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

diff --git a/intern/rigidbody/RBI_api.h b/intern/rigidbody/RBI_api.h
index 01d27357676..a73faf4d87c 100644
--- a/intern/rigidbody/RBI_api.h
+++ b/intern/rigidbody/RBI_api.h
@@ -267,7 +267,7 @@ rbCollisionShape *RB_shape_new_gimpact_mesh(rbMeshData *mesh);
 
 int RB_shape_get_num_verts(rbCollisionShape *shape);
 
-rbCollisionShape *RB_shape_new_compound();
+rbCollisionShape *RB_shape_new_compound(void);
 void RB_shape_add_compound_child(rbCollisionShape** compound, rbCollisionShape* child, float loc[3], float rot[4]);
 
 /* Cleanup --------------------------- */
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 45255a0f7ac..51db95539b6 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -1884,7 +1884,7 @@ static void rigidbody_update_sim_ob(Scene *scene, RigidBodyWorld *rbw, Object *o
 	/* only dynamic bodies need effector update */
 	else if (rbo->type == RBO_TYPE_ACTIVE /* && ((ob->pd == NULL) || (ob->pd->forcefield == PFIELD_NULL))*/) {
 		EffectorWeights *effector_weights = rbw->effector_weights;
-		EffectedPoint epoint;
+		EffectedPoint epoint = {0};
 		ListBase *effectors;
 
 		/* get effectors present in the group specified by effector_weights */
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c
index 7843cc1bd3e..173d7d16a74 100644
--- a/source/blender/modifiers/intern/MOD_remesh.c
+++ b/source/blender/modifiers/intern/MOD_remesh.c
@@ -272,7 +272,7 @@ static DerivedMesh *repolygonize(RemeshModifierData *rmd, Object* ob, DerivedMes
 
 		orig_index = CustomData_add_layer(&dm->vertData, CD_ORIGINDEX, CD_CALLOC, NULL, n);
 
-#pragma omp parallel for
+//#pragma omp parallel for
 		for (i = 0; i < n; i++)
 		{
 			copy_v3_v3(mv[i].co, pos[i]);
@@ -353,7 +353,7 @@ static DerivedMesh *repolygonize(RemeshModifierData *rmd, Object* ob, DerivedMes
 		oqW = CustomData_get_layer_named(&derived->vertData, CD_PROP_FLT, "quatW");
 
 
-#pragma omp parallel for
+//#pragma omp parallel for
 		for (i = 0; i < n; i++)
 		{
 			copy_v3_v3(mv[i].co, pos[i]);
@@ -375,7 +375,7 @@ static DerivedMesh *repolygonize(RemeshModifierData *rmd, Object* ob, DerivedMes
 			}
 		}
 
-#pragma omp parallel for
+//#pragma omp parallel for
 		for (i = n; i < n + derived->numVertData; i++)
 		{
 			copy_v3_v3(mv[i].co, mv2[i-n].co);



More information about the Bf-blender-cvs mailing list