Commit: b9db470636fb77e0240061fb27301b42f05d271b
Author: Bastien Montagne
Date: Tue Jun 5 11:22:43 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb9db470636fb77e0240061fb27301b42f05d271b
Fix stupid mistake in previous commit.
===================================================================
M source/blender/makesrna/intern/rna_object.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_object.c
b/source/blender/makesrna/intern/rna_object.c
index 1d1ee499100..398928901b8 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -1994,7 +1994,7 @@ static void rna_def_object(BlenderRNA *brna)
RNA_def_property_struct_type(prop, "Material");
RNA_def_property_pointer_funcs(prop, "rna_Object_active_material_get",
"rna_Object_active_material_set", NULL,
NULL);
- RNA_def_property_override_flag(prop, PROP_EDITABLE);
+ RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_editable_func(prop,
"rna_Object_active_material_editable");
RNA_def_property_ui_text(prop, "Active Material", "Active material
being displayed");
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW,
"rna_MaterialSlot_update");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
