[Bf-blender-cvs] [bb89b6788df] soc-2019-outliner: Merge branch 'master' into soc-2019-outliner

[Nathan Craddock]

Commit: bb89b6788dfe0708e373655218a2c83da1481138
Author: Nathan Craddock
Date:   Sat Jun 15 21:39:33 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rBbb89b6788dfe0708e373655218a2c83da1481138

Merge branch 'master' into soc-2019-outliner

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



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

diff --cc source/blender/makesrna/intern/rna_constraint.c
index e5caf5885ba,1724bf1652b..aa091c8a9fb
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@@ -3028,10 -3028,9 +3028,10 @@@ void RNA_def_constraint(BlenderRNA *brn
    /* flags */
    prop = RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE);
    RNA_def_property_boolean_sdna(prop, NULL, "flag", CONSTRAINT_OFF);
-   RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
+   RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
    RNA_def_property_ui_text(prop, "Disable", "Enable/Disable Constraint");
    RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update");
 +  RNA_def_property_ui_icon(prop, ICON_HIDE_OFF, -1);
  
    prop = RNA_def_property(srna, "show_expanded", PROP_BOOLEAN, PROP_NONE);
    RNA_def_property_flag(prop, PROP_NO_DEG_UPDATE);