Merge from 2.5 r21112 through r21160
[blender.git] / source / blender / makesrna / intern / rna_object.c
index 14ce5954cb7c946d19fa82407525193423fbbde1..76553e09fb2b97677e3962891ed89707224d2c8b 100644 (file)
@@ -417,11 +417,13 @@ static void rna_def_material_slot(BlenderRNA *brna)
        RNA_def_property_flag(prop, PROP_EDITABLE);
        RNA_def_property_pointer_funcs(prop, "rna_MaterialSlot_material_get", "rna_MaterialSlot_material_set", NULL);
        RNA_def_property_ui_text(prop, "Material", "Material datablock used by this material slot.");
+       RNA_def_property_update(prop, NC_OBJECT|ND_SHADING, "rna_Object_update");
 
        prop= RNA_def_property(srna, "link", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_items(prop, link_items);
        RNA_def_property_enum_funcs(prop, "rna_MaterialSlot_link_get", "rna_MaterialSlot_link_set", NULL);
        RNA_def_property_ui_text(prop, "Link", "Link material to object or the object's data.");
+       RNA_def_property_update(prop, NC_OBJECT|ND_SHADING, "rna_Object_update");
 
        prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
        RNA_def_property_string_funcs(prop, "rna_MaterialSlot_name_get", "rna_MaterialSlot_name_length", NULL);