[Bf-blender-cvs] [162c320a75b] master: LibOverride: Add some basic non-nodal material properties to override realm.

Bastien Montagne noreply at git.blender.org
Fri Aug 23 10:27:28 CEST 2019


Commit: 162c320a75b02fcb747ea1b0eab77435396d7e89
Author: Bastien Montagne
Date:   Fri Aug 23 10:26:55 2019 +0200
Branches: master
https://developer.blender.org/rB162c320a75b02fcb747ea1b0eab77435396d7e89

LibOverride: Add some basic non-nodal material properties to override realm.

===================================================================

M	source/blender/makesrna/intern/rna_material.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index c108ce90490..e6c432bec6c 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -357,12 +357,14 @@ static void rna_def_material_display(StructRNA *srna)
   prop = RNA_def_property(srna, "diffuse_color", PROP_FLOAT, PROP_COLOR);
   RNA_def_property_float_sdna(prop, NULL, "r");
   RNA_def_property_array(prop, 4);
+  RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
   RNA_def_property_ui_text(prop, "Diffuse Color", "Diffuse color of the material");
   RNA_def_property_update(prop, 0, "rna_Material_draw_update");
 
   prop = RNA_def_property(srna, "specular_color", PROP_FLOAT, PROP_COLOR);
   RNA_def_property_float_sdna(prop, NULL, "specr");
   RNA_def_property_array(prop, 3);
+  RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
   RNA_def_property_ui_text(prop, "Specular Color", "Specular color of the material");
   RNA_def_property_update(prop, 0, "rna_Material_draw_update");
 
@@ -370,6 +372,7 @@ static void rna_def_material_display(StructRNA *srna)
   RNA_def_property_float_sdna(prop, NULL, "roughness");
   RNA_def_property_float_default(prop, 0.25f);
   RNA_def_property_range(prop, 0, 1);
+  RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
   RNA_def_property_ui_text(prop, "Roughness", "Roughness of the material");
   RNA_def_property_update(prop, 0, "rna_Material_draw_update");
 
@@ -377,12 +380,14 @@ static void rna_def_material_display(StructRNA *srna)
   RNA_def_property_float_sdna(prop, NULL, "spec");
   RNA_def_property_float_default(prop, 0.5f);
   RNA_def_property_range(prop, 0, 1);
+  RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
   RNA_def_property_ui_text(prop, "Specular", "How intense (bright) the specular reflection is");
   RNA_def_property_update(prop, 0, "rna_Material_draw_update");
 
   prop = RNA_def_property(srna, "metallic", PROP_FLOAT, PROP_FACTOR);
   RNA_def_property_float_sdna(prop, NULL, "metallic");
   RNA_def_property_range(prop, 0.0f, 1.0f);
+  RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
   RNA_def_property_ui_text(prop, "Metallic", "Amount of mirror reflection for raytrace");
   RNA_def_property_update(prop, 0, "rna_Material_update");



More information about the Bf-blender-cvs mailing list