blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Multires: Cleanup, remove redundant argument 

Scene can be queried from the dependency graph.
This commit is contained in:
Sergey Sharybin 2020-03-17 14:18:27 +01:00
parent 20456b52b4
commit 17abae45f1
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -270,13 +270,11 @@ static MDisps *multires_mdisps_initialize_hidden(Mesh *me, int level)
return mdisps;
}
Mesh *BKE_multires_create_mesh(struct Depsgraph *depsgraph,
Scene *scene,
MultiresModifierData *mmd,
Object *ob)
Mesh *BKE_multires_create_mesh(struct Depsgraph *depsgraph, MultiresModifierData *mmd, Object *ob)
{
Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
Mesh *deformed_mesh = mesh_get_eval_deform(depsgraph, scene, ob_eval, &CD_MASK_BAREMESH);
Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
Mesh *deformed_mesh = mesh_get_eval_deform(depsgraph, scene_eval, ob_eval, &CD_MASK_BAREMESH);
ModifierEvalContext modifier_ctx = {
.depsgraph = depsgraph,
.object = ob_eval,

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

@ -107,11 +107,9 @@ bool multiresModifier_reshapeFromDeformModifier(struct Depsgraph *depsgraph,
highest_mmd.lvl = highest_mmd.totlvl;
highest_mmd.renderlvl = highest_mmd.totlvl;
Scene *scene_eval = DEG_get_evaluated_scene(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, scene_eval, &highest_mmd, object);
Mesh *multires_mesh = BKE_multires_create_mesh(depsgraph, &highest_mmd, object);
int num_deformed_verts;
float(*deformed_verts)[3] = BKE_mesh_vert_coords_alloc(multires_mesh, &num_deformed_verts);