[Bf-blender-cvs] [1ee77eb7f8f] master: Fix error in recent is_dirty preferences flag
Campbell Barton
noreply at git.blender.org
Sat May 11 11:23:07 CEST 2019
Commit: 1ee77eb7f8f49d4e4483b57bb5b7d971b280f24c
Author: Campbell Barton
Date: Sat May 11 19:18:27 2019 +1000
Branches: master
https://developer.blender.org/rB1ee77eb7f8f49d4e4483b57bb5b7d971b280f24c
Fix error in recent is_dirty preferences flag
Error in b95b6b796695a8b82 caused crash changing themes.
Resolves T64444
===================================================================
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index ccfeb8441bd..54bcc41c504 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -184,10 +184,11 @@ static void rna_userdef_version_get(PointerRNA *ptr, int *value)
value[2] = userdef->subversionfile;
}
-static void rna_userdef_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
+static void rna_userdef_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *UNUSED(ptr))
{
- UserDef *userdef = (UserDef *)ptr->data;
- userdef->runtime.is_dirty = true;
+ /* We can't use 'ptr->data' because this update function
+ * is used for themes and other nested data. */
+ U.runtime.is_dirty = true;
WM_main_add_notifier(NC_WINDOW, NULL);
}
More information about the Bf-blender-cvs
mailing list