[Bf-blender-cvs] [cc9255f8a8f] blender2.8: Sync rna_access rna property update cow check with depsgraph

Dalai Felinto noreply at git.blender.org
Tue Aug 14 15:15:35 CEST 2018


Commit: cc9255f8a8f1f3cf0f75c13a568dc9458e0ffb8e
Author: Dalai Felinto
Date:   Tue Aug 14 10:12:05 2018 -0300
Branches: blender2.8
https://developer.blender.org/rBcc9255f8a8f1f3cf0f75c13a568dc9458e0ffb8e

Sync rna_access rna property update cow check with depsgraph

This is a manual synchronization. If we need to re-use the same util in both
areas it would be welcomed as well. For now this at least get things back to a
working state.

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

M	source/blender/makesdna/DNA_ID.h

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

diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 634819b33ce..d7dfa70adad 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -419,9 +419,10 @@ typedef enum ID_Type {
                                          ID_IS_STATIC_OVERRIDE((_id)) && \
                                          (((ID *)(_id))->override_static->flag & STATICOVERRIDE_AUTO))
 
-/* No copy-on-write for these types. */
+/* No copy-on-write for these types.
+ * Keep in sync with check_datablocks_copy_on_writable and deg_copy_on_write_is_needed */
 #define ID_TYPE_IS_COW(_id_type) \
-	(!ELEM(_id_type, ID_WM, ID_SCR, ID_SCRN, ID_IM, ID_MC, ID_LI))
+	(!ELEM(_id_type, ID_BR, ID_LS, ID_PAL, ID_IM))
 
 #ifdef GS
 #  undef GS



More information about the Bf-blender-cvs mailing list