diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-03-17 16:20:14 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-03-17 18:41:43 +0300 |
commit | a45c34ae8eb73448726a92d0b4d79b632dc69d9e (patch) | |
tree | ad582738c48f9cbeb40d1777d117ea69f883d60a /source/blender/blenkernel/intern | |
parent | 17abae45f131a8e97871c0738ec1bac8f836679c (diff) |
Multires: Cleanup, argument naming and order
Use full argument name.
Also order arguments in the generosity order: from depsgraph
(which has everything) to object (which contains multires)
specific multires modifier.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 11 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/multires_reshape.c | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 290bed02913..b8464bf02c0 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -270,14 +270,17 @@ static MDisps *multires_mdisps_initialize_hidden(Mesh *me, int level) return mdisps; } -Mesh *BKE_multires_create_mesh(struct Depsgraph *depsgraph, MultiresModifierData *mmd, Object *ob) +Mesh *BKE_multires_create_mesh(struct Depsgraph *depsgraph, + Object *object, + MultiresModifierData *mmd) { - Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + Object *object_eval = DEG_get_evaluated_object(depsgraph, object); Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); - Mesh *deformed_mesh = mesh_get_eval_deform(depsgraph, scene_eval, ob_eval, &CD_MASK_BAREMESH); + Mesh *deformed_mesh = mesh_get_eval_deform( + depsgraph, scene_eval, object_eval, &CD_MASK_BAREMESH); ModifierEvalContext modifier_ctx = { .depsgraph = depsgraph, - .object = ob_eval, + .object = object_eval, .flag = MOD_APPLY_USECACHE | MOD_APPLY_IGNORE_SIMPLIFY, }; diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c index 657dfcec42f..6097121fefd 100644 --- a/source/blender/blenkernel/intern/multires_reshape.c +++ b/source/blender/blenkernel/intern/multires_reshape.c @@ -109,7 +109,7 @@ bool multiresModifier_reshapeFromDeformModifier(struct Depsgraph *depsgraph, /* Create mesh for the multires, ignoring any further modifiers (leading * deformation modifiers will be applied though). */ - Mesh *multires_mesh = BKE_multires_create_mesh(depsgraph, &highest_mmd, object); + Mesh *multires_mesh = BKE_multires_create_mesh(depsgraph, object, &highest_mmd); int num_deformed_verts; float(*deformed_verts)[3] = BKE_mesh_vert_coords_alloc(multires_mesh, &num_deformed_verts); |