[Bf-blender-cvs] [d9f4071ac66] master: Fix T64969: changing color space in image texture node loses changes

Brecht Van Lommel noreply at git.blender.org
Wed May 22 10:12:46 CEST 2019


Commit: d9f4071ac66c60ba2a4136d9ef6441377565a991
Author: Brecht Van Lommel
Date:   Wed May 22 10:06:31 2019 +0200
Branches: master
https://developer.blender.org/rBd9f4071ac66c60ba2a4136d9ef6441377565a991

Fix T64969: changing color space in image texture node loses changes

Don't allow changing it for painted images until they have been saved, similar
to sidebar panels. This could be solved better, for now the important thing is
not to lose changes.

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

M	source/blender/editors/space_node/drawnode.c

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

diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index bf6ec961a5d..e39e024e44a 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -713,6 +713,11 @@ static void node_buts_image_user(uiLayout *layout,
   PointerRNA colorspace_settings_ptr = RNA_pointer_get(imaptr, "colorspace_settings");
   uiItemL(split, IFACE_("Color Space"), ICON_NONE);
   uiItemR(split, &colorspace_settings_ptr, "name", 0, "", ICON_NONE);
+
+  /* Avoid losing changes image is painted. */
+  if (BKE_image_is_dirty(imaptr->data)) {
+    uiLayoutSetEnabled(split, false);
+  }
 }
 
 static void node_shader_buts_mapping(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)



More information about the Bf-blender-cvs mailing list