blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 774 Projects 19 Wiki Activity

WIP: Fix #93103: modifier iterations can be set to a negative value #110916

Draft
Philipp Oeser wants to merge 1 commits from lichtwerk/blender:93103 into main
pull from: lichtwerk/blender:93103
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 1 Files Changed 1 +8 -4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/makesrna/intern/rna_modifier.cc
View File

@ -3281,8 +3281,9 @@ static void rna_def_modifier_smooth(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Factor", "Strength of modifier effect");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE);
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, nullptr, "repeat");
RNA_def_property_range(prop, 0, SHRT_MAX);
RNA_def_property_ui_range(prop, 0, 30, 1, -1);
RNA_def_property_ui_text(prop, "Repeat", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
@ -3352,8 +3353,9 @@ static void rna_def_modifier_correctivesmooth(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Lambda Factor", "Smooth effect factor");
RNA_def_property_update(prop, 0, "rna_CorrectiveSmoothModifier_update");
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE);
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, nullptr, "repeat");
RNA_def_property_range(prop, 0, SHRT_MAX);
RNA_def_property_ui_range(prop, 0, 200, 1, -1);
RNA_def_property_ui_text(prop, "Repeat", "");
RNA_def_property_update(prop, 0, "rna_CorrectiveSmoothModifier_update");
@ -3464,8 +3466,9 @@ static void rna_def_modifier_laplaciansmooth(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Lambda Border", "Lambda factor in border");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE);
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, nullptr, "repeat");
RNA_def_property_range(prop, 0, SHRT_MAX);
RNA_def_property_ui_range(prop, 0, 200, 1, -1);
RNA_def_property_ui_text(prop, "Repeat", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
@ -6240,8 +6243,9 @@ static void rna_def_modifier_laplaciandeform(BlenderRNA *brna)
RNA_def_property_string_funcs(
prop, nullptr, nullptr, "rna_LaplacianDeformModifier_anchor_grp_name_set");
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_NONE);
prop = RNA_def_property(srna, "iterations", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, nullptr, "repeat");
RNA_def_property_range(prop, 0, SHRT_MAX);
RNA_def_property_ui_range(prop, 1, 50, 1, -1);
RNA_def_property_ui_text(prop, "Repeat", "");
RNA_def_property_update(prop, 0, "rna_Modifier_update");