blender
/
blender
137
416
Fork 599
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

UI: Gray out Scene Auto-Masking option if equivalent Brush option is used #102971 #106126

Open
Henry-Chang wants to merge 11 commits from Henry-Chang/blender:gray-out-automasking into main
pull from: Henry-Chang/blender:gray-out-automasking
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 20 Commits 11 Files Changed 14 +6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d232b8800a - Show all commits

6
source/blender/makesrna/intern/rna_sculpt_paint.c
View File

@ -1809,7 +1809,13 @@ static int rna_Scene_automasking_view_normal_editable(struct PointerRNA *ptr, co
if (sd && (sd->paint.brush->automasking_flags & BRUSH_AUTOMASKING_VIEW_NORMAL)) {
*r_info = "The active brush already has the same auto-masking enabled.";
// TODO should probably utilize RNA_def_property_float_funcs to sync values between automasking_view and automasking_scene_view
sd->automasking_scene_view_normal_limit = sd->automasking_view_normal_limit;
Julian Eisel commented 2023-05-15 11:24:26 +02:00
Review
Copy Link

Do not change properties inside of an editable callback, these are meant to be mere queries and not modify data.

Do not change properties inside of an editable callback, these are meant to be mere queries and not modify data.
Henry-Chang commented 2023-05-15 15:12:35 +02:00
Review
Copy Link

Agreed. Will definitely revert them.

Agreed. Will definitely revert them.
sd->automasking_scene_view_normal_falloff = sd->automasking_view_normal_falloff;
return PROP_INACTIVE | PROP_EDITABLE;
} else {
sd->automasking_view_normal_limit = sd->automasking_scene_view_normal_limit;
sd->automasking_view_normal_falloff = sd->automasking_scene_view_normal_falloff;
}
return sd ? PROP_EDITABLE: 0;