archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Multires: Cleanup, argument naming and order

Browse Source 
Use full argument name.

Also order arguments in the generosity order: from depsgraph
(which has everything) to object (which contains multires)
specific multires modifier.
This commit is contained in:
Sergey Sharybin
2020-03-17 14:20:14 +01:00
parent 17abae45f1
commit a45c34ae8e
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_multires.h
View File

@@ -91,8 +91,8 @@ int multires_get_level(const struct Scene *scene,
bool render,
bool ignore_simplify);
struct Mesh *BKE_multires_create_mesh(struct Depsgraph *depsgraph,
struct MultiresModifierData *mmd,
struct Object *ob);
struct Object *object,
struct MultiresModifierData *mmd);
void multiresModifier_del_levels(struct MultiresModifierData *mmd,
struct Scene *scene,
struct Object *object,

11
source/blender/blenkernel/intern/multires.c
View File

@@ -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,
};

2
source/blender/blenkernel/intern/multires_reshape.c
View File

@@ -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);