From 9b6088cb9da4df1a893361997fc1a22986bf6f2e Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Thu, 16 Jul 2020 14:37:21 +0200 Subject: Simulation: Change BPH prefix to SIM In a previous commit the `physics` folder has been renamed to `simulation`. This commit updates the function/file prefix accordingly. --- source/blender/blenkernel/intern/cloth.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source/blender/blenkernel/intern/cloth.c') diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index f45cd5b679a..467bd68c631 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -47,7 +47,7 @@ #include "BKE_modifier.h" #include "BKE_pointcache.h" -#include "BPH_mass_spring.h" +#include "SIM_mass_spring.h" // #include "PIL_time.h" /* timing for debug prints */ @@ -344,12 +344,12 @@ static int do_init_cloth(Object *ob, ClothModifierData *clmd, Mesh *result, int return 0; } - BKE_cloth_solver_set_positions(clmd); + SIM_cloth_solver_set_positions(clmd); ClothSimSettings *parms = clmd->sim_parms; if (parms->flags & CLOTH_SIMSETTINGS_FLAG_PRESSURE && !(parms->flags & CLOTH_SIMSETTINGS_FLAG_PRESSURE_VOL)) { - BKE_cloth_solver_set_volume(clmd); + SIM_cloth_solver_set_volume(clmd); } clmd->clothObject->last_frame = MINFRAME - 1; @@ -404,7 +404,7 @@ static int do_step_cloth( // TIMEIT_START(cloth_step) /* call the solver. */ - ret = BPH_cloth_solve(depsgraph, ob, framenr, clmd, effectors); + ret = SIM_cloth_solve(depsgraph, ob, framenr, clmd, effectors); // TIMEIT_END(cloth_step) @@ -479,7 +479,7 @@ void clothModifier_do(ClothModifierData *clmd, if (cache_result == PTCACHE_READ_EXACT || cache_result == PTCACHE_READ_INTERPOLATED || (!can_simulate && cache_result == PTCACHE_READ_OLD)) { - BKE_cloth_solver_set_positions(clmd); + SIM_cloth_solver_set_positions(clmd); cloth_to_object(ob, clmd, vertexCos); BKE_ptcache_validate(cache, framenr); @@ -493,7 +493,7 @@ void clothModifier_do(ClothModifierData *clmd, return; } if (cache_result == PTCACHE_READ_OLD) { - BKE_cloth_solver_set_positions(clmd); + SIM_cloth_solver_set_positions(clmd); } else if ( /* 2.4x disabled lib, but this can be used in some cases, testing further - campbell */ @@ -537,7 +537,7 @@ void cloth_free_modifier(ClothModifierData *clmd) cloth = clmd->clothObject; if (cloth) { - BPH_cloth_solver_free(clmd); + SIM_cloth_solver_free(clmd); // Free the verts. if (cloth->verts != NULL) { @@ -619,7 +619,7 @@ void cloth_free_modifier_extern(ClothModifierData *clmd) printf("cloth_free_modifier_extern in\n"); } - BPH_cloth_solver_free(clmd); + SIM_cloth_solver_free(clmd); // Free the verts. if (cloth->verts != NULL) { @@ -919,10 +919,10 @@ static int cloth_from_object( } // init our solver - BPH_cloth_solver_init(ob, clmd); + SIM_cloth_solver_init(ob, clmd); if (!first) { - BKE_cloth_solver_set_positions(clmd); + SIM_cloth_solver_set_positions(clmd); } clmd->clothObject->bvhtree = bvhtree_build_from_cloth(clmd, clmd->coll_parms->epsilon); -- cgit v1.2.3