1 files changed, 24 insertions, 11 deletions

diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 65c43ebc151..6acd9d16f80 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -387,6 +387,8 @@ extern StructRNA RNA_MeshIntProperty;
 extern StructRNA RNA_MeshLoop;
 extern StructRNA RNA_MeshLoopColor;
 extern StructRNA RNA_MeshLoopColorLayer;
+extern StructRNA RNA_MeshVertColor;
+extern StructRNA RNA_MeshVertColorLayer;
 extern StructRNA RNA_MeshLoopTriangle;
 extern StructRNA RNA_MeshPolygon;
 extern StructRNA RNA_MeshSequenceCacheModifier;
@@ -819,12 +821,12 @@ int RNA_property_array_item_index(PropertyRNA *prop, char name);
 
 int RNA_property_string_maxlength(PropertyRNA *prop);
 
-const char *RNA_property_ui_name(PropertyRNA *prop);
-const char *RNA_property_ui_name_raw(PropertyRNA *prop);
-const char *RNA_property_ui_description(PropertyRNA *prop);
-const char *RNA_property_ui_description_raw(PropertyRNA *prop);
-const char *RNA_property_translation_context(PropertyRNA *prop);
-int RNA_property_ui_icon(PropertyRNA *prop);
+const char *RNA_property_ui_name(const PropertyRNA *prop);
+const char *RNA_property_ui_name_raw(const PropertyRNA *prop);
+const char *RNA_property_ui_description(const PropertyRNA *prop);
+const char *RNA_property_ui_description_raw(const PropertyRNA *prop);
+const char *RNA_property_translation_context(const PropertyRNA *prop);
+int RNA_property_ui_icon(const PropertyRNA *prop);
 
 /* Dynamic Property Information */
 
@@ -1465,6 +1467,7 @@ bool RNA_struct_override_matches(struct Main *bmain,
                                  struct PointerRNA *ptr_local,
                                  struct PointerRNA *ptr_reference,
                                  const char *root_path,
+                                 const size_t root_path_len,
                                  struct IDOverrideLibrary *override,
                                  const eRNAOverrideMatch flags,
                                  eRNAOverrideMatchResult *r_report_flags);
@@ -1481,15 +1484,24 @@ void RNA_struct_override_apply(struct Main *bmain,
                                struct PointerRNA *ptr_storage,
                                struct IDOverrideLibrary *override);
 
-struct IDOverrideLibraryProperty *RNA_property_override_property_find(PointerRNA *ptr,
-                                                                      PropertyRNA *prop);
-struct IDOverrideLibraryProperty *RNA_property_override_property_get(PointerRNA *ptr,
+struct IDOverrideLibraryProperty *RNA_property_override_property_find(struct Main *bmain,
+                                                                      PointerRNA *ptr,
+                                                                      PropertyRNA *prop,
+                                                                      struct ID **r_owner_id);
+struct IDOverrideLibraryProperty *RNA_property_override_property_get(struct Main *bmain,
+                                                                     PointerRNA *ptr,
                                                                      PropertyRNA *prop,
                                                                      bool *r_created);
 
 struct IDOverrideLibraryPropertyOperation *RNA_property_override_property_operation_find(
-    PointerRNA *ptr, PropertyRNA *prop, const int index, const bool strict, bool *r_strict);
+    struct Main *bmain,
+    PointerRNA *ptr,
+    PropertyRNA *prop,
+    const int index,
+    const bool strict,
+    bool *r_strict);
 struct IDOverrideLibraryPropertyOperation *RNA_property_override_property_operation_get(
+    struct Main *bmain,
     PointerRNA *ptr,
     PropertyRNA *prop,
     const short operation,
@@ -1498,7 +1510,8 @@ struct IDOverrideLibraryPropertyOperation *RNA_property_override_property_operat
     bool *r_strict,
     bool *r_created);
 
-eRNAOverrideStatus RNA_property_override_library_status(PointerRNA *ptr,
+eRNAOverrideStatus RNA_property_override_library_status(struct Main *bmainm,
+                                                        PointerRNA *ptr,
                                                         PropertyRNA *prop,
                                                         const int index);