griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Remove unused return argument from "ensure mask" function

Browse Source
This commit is contained in:
Hans Goudey
2023-11-20 13:45:34 -05:00
parent e9db14b3d8
commit 76dc180c3d
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenkernel/BKE_paint.hh
View File

@@ -865,10 +865,10 @@ bool *BKE_sculpt_hide_poly_ensure(Mesh *mesh);
*
* \note always call *before* #BKE_sculpt_update_object_for_edit.
*/
int BKE_sculpt_mask_layers_ensure(Depsgraph *depsgraph,
Main *bmain,
Object *ob,
MultiresModifierData *mmd);
void BKE_sculpt_mask_layers_ensure(Depsgraph *depsgraph,
Main *bmain,
Object *ob,
MultiresModifierData *mmd);
void BKE_sculpt_toolsettings_data_ensure(Scene *scene);
PBVH *BKE_sculpt_object_pbvh_ensure(Depsgraph *depsgraph, Object *ob);
@@ -884,11 +884,6 @@ void BKE_sculpt_sync_face_visibility_to_grids(Mesh *mesh, SubdivCCG *subdiv_ccg)
*/
bool BKE_sculptsession_use_pbvh_draw(const Object *ob, const RegionView3D *rv3d);
enum {
SCULPT_MASK_LAYER_CALC_VERT = (1 << 0),
SCULPT_MASK_LAYER_CALC_LOOP = (1 << 1),
};
/* paint_vertex.cc */
/**

14
source/blender/blenkernel/intern/paint.cc
View File

@@ -1998,10 +1998,10 @@ bool *BKE_sculpt_hide_poly_ensure(Mesh *mesh)
&mesh->face_data, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->faces_num, ".hide_poly"));
}
int BKE_sculpt_mask_layers_ensure(Depsgraph *depsgraph,
Main *bmain,
Object *ob,
MultiresModifierData *mmd)
void BKE_sculpt_mask_layers_ensure(Depsgraph *depsgraph,
Main *bmain,
Object *ob,
MultiresModifierData *mmd)
{
using namespace blender;
using namespace blender::bke;
@@ -2009,7 +2009,6 @@ int BKE_sculpt_mask_layers_ensure(Depsgraph *depsgraph,
const OffsetIndices faces = me->faces();
const Span<int> corner_verts = me->corner_verts();
MutableAttributeAccessor attributes = me->attributes_for_write();
int ret = 0;
/* if multires is active, create a grid paint mask layer if there
* isn't one already */
@@ -2061,18 +2060,13 @@ int BKE_sculpt_mask_layers_ensure(Depsgraph *depsgraph,
if (depsgraph) {
BKE_scene_graph_evaluated_ensure(depsgraph, bmain);
}
ret |= SCULPT_MASK_LAYER_CALC_LOOP;
}
/* Create vertex paint mask layer if there isn't one already. */
if (attributes.add<float>(".sculpt_mask", ATTR_DOMAIN_POINT, AttributeInitDefaultValue())) {
/* The evaluated mesh must be updated to contain the new data. */
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
ret |= SCULPT_MASK_LAYER_CALC_VERT;
}
return ret;
}
void BKE_sculpt_toolsettings_data_ensure(Scene *scene)