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

Cleanup: Minor tidying up in paint.cc modifier methods

Browse Source 
* Reduces scope of variables
* Joins declaration and assignment where possible
* Uses static_cast and reinterpret_cast instead of C-style cast
* Uses const where possible
* Uses reference instead of pointer where possible

Pull Request: https://projects.blender.org/blender/blender/pulls/134816
This commit is contained in:
Sean Kim
2025-02-21 00:31:58 +01:00
committed by Sean Kim
parent 4fab3b04b3
commit 6b59fd5c5e
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2246,9 +2246,7 @@ static MultiresModifierData *sculpt_multires_modifier_get(const Scene *scene,
Object *ob,
const bool auto_create_mdisps)
{
Mesh *mesh = (Mesh *)ob->data;
ModifierData *md;
VirtualModifierData virtual_modifier_data;
Mesh &mesh = *static_cast<Mesh *>(ob->data);
if (ob->sculpt && ob->sculpt->bm) {
/* Can't combine multires and dynamic topology. */
@@ -2257,7 +2255,7 @@ static MultiresModifierData *sculpt_multires_modifier_get(const Scene *scene,
bool need_mdisps = false;
if (!CustomData_get_layer(&mesh->corner_data, CD_MDISPS)) {
if (!CustomData_get_layer(&mesh.corner_data, CD_MDISPS)) {
if (!auto_create_mdisps) {
/* Multires can't work without displacement layer. */
return nullptr;
@@ -2271,10 +2269,12 @@ static MultiresModifierData *sculpt_multires_modifier_get(const Scene *scene,
return nullptr;
}
for (md = BKE_modifiers_get_virtual_modifierlist(ob, &virtual_modifier_data); md; md = md->next)
VirtualModifierData virtual_modifier_data;
for (ModifierData *md = BKE_modifiers_get_virtual_modifierlist(ob, &virtual_modifier_data); md;
md = md->next)
{
if (md->type == eModifierType_Multires) {
MultiresModifierData *mmd = (MultiresModifierData *)md;
MultiresModifierData *mmd = reinterpret_cast<MultiresModifierData *>(md);
if (!BKE_modifier_is_enabled(scene, md, eModifierMode_Realtime)) {
continue;
@@ -2282,7 +2282,7 @@ static MultiresModifierData *sculpt_multires_modifier_get(const Scene *scene,
if (mmd->sculptlvl > 0 && !(mmd->flags & eMultiresModifierFlag_UseSculptBaseMesh)) {
if (need_mdisps) {
CustomData_add_layer(&mesh->corner_data, CD_MDISPS, CD_SET_DEFAULT, mesh->corners_num);
CustomData_add_layer(&mesh.corner_data, CD_MDISPS, CD_SET_DEFAULT, mesh.corners_num);
}
return mmd;
@@ -2301,35 +2301,34 @@ MultiresModifierData *BKE_sculpt_multires_active(const Scene *scene, Object *ob)
}
/* Checks if there are any supported deformation modifiers active */
static bool sculpt_modifiers_active(Scene *scene, Sculpt *sd, Object *ob)
static bool sculpt_modifiers_active(const Scene *scene, const Sculpt *sd, Object *ob)
{
ModifierData *md;
Mesh *mesh = (Mesh *)ob->data;
VirtualModifierData virtual_modifier_data;
const Mesh &mesh = *static_cast<Mesh *>(ob->data);
if (ob->sculpt->bm || BKE_sculpt_multires_active(scene, ob)) {
return false;
}
/* Non-locked shape keys could be handled in the same way as deformed mesh. */
if ((ob->shapeflag & OB_SHAPE_LOCK) == 0 && mesh->key && ob->shapenr) {
if ((ob->shapeflag & OB_SHAPE_LOCK) == 0 && mesh.key && ob->shapenr) {
return true;
}
md = BKE_modifiers_get_virtual_modifierlist(ob, &virtual_modifier_data);
/* Exception for shape keys because we can edit those. */
for (; md; md = md->next) {
VirtualModifierData virtual_modifier_data;
for (ModifierData *md = BKE_modifiers_get_virtual_modifierlist(ob, &virtual_modifier_data); md;
md = md->next)
{
const ModifierTypeInfo *mti = BKE_modifier_get_info(static_cast<ModifierType>(md->type));
if (!BKE_modifier_is_enabled(scene, md, eModifierMode_Realtime)) {
continue;
}
if (md->type == eModifierType_Multires && (ob->mode & OB_MODE_SCULPT)) {
MultiresModifierData *mmd = (MultiresModifierData *)md;
MultiresModifierData *mmd = reinterpret_cast<MultiresModifierData *>(md);
if (!(mmd->flags & eMultiresModifierFlag_UseSculptBaseMesh)) {
continue;
}
}
/* Exception for shape keys because we can edit those. */
if (md->type == eModifierType_ShapeKey) {
continue;
}