blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Multires: Cleanup, better function naming 

Hopefully it makes it more clear, and also allows to introduce
initialization from pre-created Subdiv descriptor.
This commit is contained in:
Sergey Sharybin 2020-10-22 17:25:41 +02:00
parent e4728d0a16
commit 50c475e534
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

8
source/blender/blenkernel/intern/multires_reshape.h
View File

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

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

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

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

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