[Bf-blender-cvs] [2856f3b5839] master: Fix T88974: Add missing liboverrides to GP modifiers and shaderfx.
Bastien Montagne
noreply at git.blender.org
Wed Jun 9 18:49:00 CEST 2021
Commit: 2856f3b58392a64204c808c8760739820da287f4
Author: Bastien Montagne
Date: Wed Jun 9 18:47:48 2021 +0200
Branches: master
https://developer.blender.org/rB2856f3b58392a64204c808c8760739820da287f4
Fix T88974: Add missing liboverrides to GP modifiers and shaderfx.
Proper RNA code was simply never added for those...
===================================================================
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_shader_fx.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index 4aad0741151..92d65961743 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -650,6 +650,8 @@ static void rna_def_modifier_gpencilnoise(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "NoiseGpencilModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_NOISE);
+ RNA_define_lib_overridable(true);
+
prop = RNA_def_property(srna, "layer", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "layername");
RNA_def_property_ui_text(prop, "Layer", "Layer name");
@@ -657,7 +659,6 @@ static void rna_def_modifier_gpencilnoise(BlenderRNA *brna)
prop = RNA_def_property(srna, "material", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_EDITABLE);
- RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_pointer_funcs(prop,
NULL,
"rna_NoiseGpencilModifier_material_set",
@@ -776,6 +777,8 @@ static void rna_def_modifier_gpencilnoise(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_NOISE_INVERT_LAYERPASS);
RNA_def_property_ui_text(prop, "Inverse Pass", "Inverse filter");
RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
+
+ RNA_define_lib_overridable(false);
}
static void rna_def_modifier_gpencilsmooth(BlenderRNA *brna)
@@ -788,6 +791,8 @@ static void rna_def_modifier_gpencilsmooth(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "SmoothGpencilModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_SMOOTH);
+ RNA_define_lib_overridable(true);
+
prop = RNA_def_property(srna, "layer", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "layername");
RNA_def_property_ui_text(prop, "Layer", "Layer name");
@@ -795,7 +800,6 @@ static void rna_def_modifier_gpencilsmooth(BlenderRNA *brna)
prop = RNA_def_property(srna, "material", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_EDITABLE);
- RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_pointer_funcs(prop,
NULL,
"rna_SmoothGpencilModifier_material_set",
@@ -894,6 +898,8 @@ static void rna_def_modifier_gpencilsmooth(BlenderRNA *brna)
RNA_def_property_pointer_sdna(prop, NULL, "curve_intensity");
RNA_def_property_ui_text(prop, "Curve", "Custom curve to apply effect");
RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
+
+ RNA_define_lib_overridable(false);
}
static void rna_def_modifier_gpencilsubdiv(BlenderRNA *brna)
@@ -906,6 +912,8 @@ static void rna_def_modifier_gpencilsubdiv(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "SubdivGpencilModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_SUBSURF);
+ RNA_define_lib_overridable(true);
+
prop = RNA_def_property(srna, "layer", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "layername");
RNA_def_property_ui_text(prop, "Layer", "Layer name");
@@ -913,7 +921,6 @@ static void rna_def_modifier_gpencilsubdiv(BlenderRNA *brna)
prop = RNA_def_property(srna, "material", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_EDITABLE);
- RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_pointer_funcs(prop,
NULL,
"rna_SubdivGpencilModifier_material_set",
@@ -965,6 +972,8 @@ static void rna_def_modifier_gpencilsubdiv(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_SUBDIV_INVERT_LAYERPASS);
RNA_def_property_ui_text(prop, "Inverse Pass", "Inverse filter");
RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
+
+ RNA_define_lib_overridable(false);
}
static void rna_def_modifier_gpencilsimplify(BlenderRNA *brna)
@@ -1001,6 +1010,8 @@ static void rna_def_modifier_gpencilsimplify(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "SimplifyGpencilModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_SIMPLIFY);
+ RNA_define_lib_overridable(true);
+
prop = RNA_def_property(srna, "layer", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "layername");
RNA_def_property_ui_text(prop, "Layer", "Layer name");
@@ -1008,7 +1019,6 @@ static void rna_def_modifier_gpencilsimplify(BlenderRNA *brna)
prop = RNA_def_property(srna, "material", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_EDITABLE);
- RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_pointer_funcs(prop,
NULL,
"rna_SimplifyGpencilModifier_material_set",
@@ -1083,6 +1093,8 @@ static void rna_def_modifier_gpencilsimplify(BlenderRNA *brna)
RNA_def_property_ui_range(prop, 0, 1.0, 0.01, 3);
RNA_def_property_ui_text(prop, "Distance", "Distance between points");
RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
+
+ RNA_define_lib_overridable(false);
}
static void rna_def_modifier_gpencilthick(BlenderRNA *brna)
@@ -1095,6 +1107,8 @@ static void rna_def_modifier_gpencilthick(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "ThickGpencilModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_THICKNESS);
+ RNA_define_lib_overridable(true);
+
prop = RNA_def_property(srna, "layer", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "layername");
RNA_def_property_ui_text(prop, "Layer", "Layer name");
@@ -1102,7 +1116,6 @@ static void rna_def_modifier_gpencilthick(BlenderRNA *brna)
prop = RNA_def_property(srna, "material", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_EDITABLE);
- RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_pointer_funcs(prop,
NULL,
"rna_ThickGpencilModifier_material_set",
@@ -1140,7 +1153,6 @@ static void rna_def_modifier_gpencilthick(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Object", "Object used as distance reference");
RNA_def_property_pointer_funcs(prop, NULL, "rna_ThickGpencilModifier_object_set", NULL, NULL);
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
- RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_update(prop, 0, "rna_GpencilModifier_dependency_update");
prop = RNA_def_property(srna, "fading_start", PROP_FLOAT, PROP_NONE);
@@ -1214,6 +1226,8 @@ static void rna_def_modifier_gpencilthick(BlenderRNA *brna)
RNA_def_property_pointer_sdna(prop, NULL, "curve_thickness");
RNA_def_property_ui_text(prop, "Curve", "Custom curve to apply effect");
RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
+
+ RNA_define_lib_overridable(false);
}
static void rna_def_modifier_gpenciloffset(BlenderRNA *brna)
@@ -1226,6 +1240,8 @@ static void rna_def_modifier_gpenciloffset(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "OffsetGpencilModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_OFFSET);
+ RNA_define_lib_overridable(true);
+
prop = RNA_def_property(srna, "layer", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "layername");
RNA_def_property_ui_text(prop, "Layer", "Layer name");
@@ -1233,7 +1249,6 @@ static void rna_def_modifier_gpenciloffset(BlenderRNA *brna)
prop = RNA_def_property(srna, "material", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_EDITABLE);
- RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_pointer_funcs(prop,
NULL,
"rna_OffsetGpencilModifier_material_set",
@@ -1330,6 +1345,8 @@ static void rna_def_modifier_gpenciloffset(BlenderRNA *brna)
RNA_def_property_ui_text(
prop, "Uniform Scale", "Use the same random seed for each scale axis for a uniform scale");
RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
+
+ RNA_define_lib_overridable(false);
}
static void rna_def_modifier_gpenciltint(BlenderRNA *brna)
@@ -1350,10 +1367,11 @@ static void rna_def_modifier_gpenciltint(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "TintGpencilModifierData");
RNA_def_struct_ui_icon(srna, ICON_COLOR);
+ RNA_define_lib_overridable(true);
+
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
RNA_def_property_ui_text(prop, "Object", "Parent object to define the center of the effect");
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
- RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_pointer_funcs(prop, NULL, "rna_TintGpencilModifier_object_set", NULL, NULL);
RNA_def_property_update(prop, 0, "rna_GpencilModifier_dependency_update");
@@ -1364,7 +1382,6 @@ static void rna_def_modifier_gpenciltint(BlenderRNA *brna)
prop = RNA_def_property(srna, "material", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_EDITABLE);
- RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_pointer_funcs(prop,
NULL,
"rna_TintGpencilModifier_material_set",
@@ -1470,6 +1487,8 @@ static void rna_def_modifier_gpenciltint(BlenderRNA *brna)
RNA_def_property_pointer_sdna(prop, NULL, "curve_intensity");
RNA_def_property_ui_text(prop, "Curve", "Custom curve to apply effect");
RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
+
+ RNA_define_lib_overridable(false);
}
static void rna_def_modifier_gpenciltime(BlenderRNA *brna)
@@ -1482,6 +1501,8 @@ static void rna_def_modifier_gpenciltime(BlenderRNA *brna)
RNA_def_struct_sdna(srna, "TimeGpencilModifierData");
RNA_def_struct_ui_icon(srna, ICON_MOD_TIME);
+ RNA_define_lib_overridable(true);
+
prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "mode");
RNA_def_property_enum_items(prop, rna_enum_time_mode_i
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list