From a0e82342d7cebb44e703c5989e5eb411a22653de Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 2 Nov 2018 13:59:04 +0100 Subject: Multires: Cleanup, naming First of all, follow our naming convention to use module prefix. Second of all, mesh is being created and is to be freed, we also have convention for such function names. --- source/blender/blenkernel/BKE_multires.h | 2 +- source/blender/blenkernel/intern/multires.c | 2 +- source/blender/blenkernel/intern/multires_reshape.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h index d4e0dbb72cd..decfdc532a6 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -90,7 +90,7 @@ int multires_get_level(const struct Scene *scene, const struct Object *ob, const bool render, bool ignore_simplify); struct DerivedMesh *get_multires_dm(struct Depsgraph *depsgraph, struct Scene *scene, struct MultiresModifierData *mmd, struct Object *ob); -struct Mesh *get_multires_mesh( +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, struct Scene *scene, struct Object *object, int direction); diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 4b5b87a3606..0138cd4cfff 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -297,7 +297,7 @@ DerivedMesh *get_multires_dm(struct Depsgraph *depsgraph, Scene *scene, Multires return dm; } -Mesh *get_multires_mesh( +Mesh *BKE_multires_create_mesh( struct Depsgraph *depsgraph, Scene *scene, MultiresModifierData *mmd, diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c index f0c8bceedd3..d5fa9e7bee6 100644 --- a/source/blender/blenkernel/intern/multires_reshape.c +++ b/source/blender/blenkernel/intern/multires_reshape.c @@ -858,7 +858,7 @@ bool multiresModifier_reshapeFromDeformModifier( /* Create mesh for the multires, ignoring any further modifiers (leading * deformation modifiers will be applied though). */ - Mesh *multires_mesh = get_multires_mesh( + Mesh *multires_mesh = BKE_multires_create_mesh( depsgraph, scene_eval, &highest_mmd, object); int num_deformed_verts; float (*deformed_verts)[3] = BKE_mesh_vertexCos_get( -- cgit v1.2.3