diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2018-05-02 21:41:56 +0300 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2018-05-02 21:41:56 +0300 |
| commit | f3ce2881c3d84fc58b91a98816982598e108c693 (patch) | |
| tree | b76c3bbafeaa7b964b366804e30539016f4bc88c | |
| parent | dac92444254803c40145a5e1533eaec82d563b53 (diff) | |
fix a clang warning, fix an improper initialisation for gcc, remove nonfunctional omp, rise BM_OMPLIMIT to avoid overheads with small datasets
| -rw-r--r-- | intern/rigidbody/RBI_api.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/rigidbody.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_remesh.c | 6 |
3 files changed, 5 insertions, 5 deletions
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); |