diff options
author | Sergey Sharybin <sergey@blender.org> | 2020-10-22 18:25:41 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2020-10-23 17:30:13 +0300 |
commit | 50c475e534805cb9c74e46be1b35c4d8cda46960 (patch) | |
tree | c897a1c309afd445dab15ecbf968651200420866 /source/blender/blenkernel | |
parent | e4728d0a167c7e89c4d551dcd7b22b9b9b4567dd (diff) |
Multires: Cleanup, better function naming
Hopefully it makes it more clear, and also allows to introduce
initialization from pre-created Subdiv descriptor.
Diffstat (limited to 'source/blender/blenkernel')
4 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c index 5bcf8f62f86..04ad78ec0de 100644 --- a/source/blender/blenkernel/intern/multires_reshape.c +++ b/source/blender/blenkernel/intern/multires_reshape.c @@ -225,7 +225,7 @@ void multiresModifier_subdivide_to_level(struct Object *object, multires_flush_sculpt_updates(object); - if (!multires_reshape_context_create_from_subdivide(&reshape_context, object, mmd, top_level)) { + if (!multires_reshape_context_create_from_modifier(&reshape_context, object, mmd, top_level)) { return; } diff --git a/source/blender/blenkernel/intern/multires_reshape.h b/source/blender/blenkernel/intern/multires_reshape.h index d6c1d79dfd7..9dec1423eba 100644 --- a/source/blender/blenkernel/intern/multires_reshape.h +++ b/source/blender/blenkernel/intern/multires_reshape.h @@ -167,10 +167,10 @@ bool multires_reshape_context_create_from_ccg(MultiresReshapeContext *reshape_co struct Mesh *base_mesh, int top_level); -bool multires_reshape_context_create_from_subdivide(MultiresReshapeContext *reshape_context, - struct Object *object, - struct MultiresModifierData *mmd, - int top_level); +bool multires_reshape_context_create_from_modifier(MultiresReshapeContext *reshape_context, + struct Object *object, + struct MultiresModifierData *mmd, + int top_level); void multires_reshape_free_original_grids(MultiresReshapeContext *reshape_context); void multires_reshape_context_free(MultiresReshapeContext *reshape_context); diff --git a/source/blender/blenkernel/intern/multires_reshape_subdivide.c b/source/blender/blenkernel/intern/multires_reshape_subdivide.c index 7b7c1efc533..d42a061084f 100644 --- a/source/blender/blenkernel/intern/multires_reshape_subdivide.c +++ b/source/blender/blenkernel/intern/multires_reshape_subdivide.c @@ -96,7 +96,7 @@ void multires_subdivide_create_tangent_displacement_linear_grids(Object *object, /* Convert the new grids to tangent displacement. */ multires_set_tot_level(object, mmd, new_top_level); - if (!multires_reshape_context_create_from_subdivide( + if (!multires_reshape_context_create_from_modifier( &reshape_context, object, mmd, new_top_level)) { return; } diff --git a/source/blender/blenkernel/intern/multires_reshape_util.c b/source/blender/blenkernel/intern/multires_reshape_util.c index c8179dd8a2d..f3b19961e29 100644 --- a/source/blender/blenkernel/intern/multires_reshape_util.c +++ b/source/blender/blenkernel/intern/multires_reshape_util.c @@ -242,10 +242,10 @@ bool multires_reshape_context_create_from_ccg(MultiresReshapeContext *reshape_co return context_verify_or_free(reshape_context); } -bool multires_reshape_context_create_from_subdivide(MultiresReshapeContext *reshape_context, - struct Object *object, - struct MultiresModifierData *mmd, - int top_level) +bool multires_reshape_context_create_from_modifier(MultiresReshapeContext *reshape_context, + struct Object *object, + struct MultiresModifierData *mmd, + int top_level) { context_zero(reshape_context); |