[Bf-blender-cvs] [62bd007646b] blender-v3.3-release: Fix T100590: Crash when changing active image texture node
Philipp Oeser
noreply at git.blender.org
Wed Aug 24 09:17:17 CEST 2022
Commit: 62bd007646b477392a3a296b0f93dc22d957a011
Author: Philipp Oeser
Date: Tue Aug 23 16:40:58 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rB62bd007646b477392a3a296b0f93dc22d957a011
Fix T100590: Crash when changing active image texture node
Mistake in own rBc76d7f7bde35.
Happened when no image was set in the Image Editor already (which is now
checked for).
Maniphest Tasks: T100590
Differential Revision: https://developer.blender.org/D15761
===================================================================
M source/blender/editors/space_node/node_edit.cc
===================================================================
diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc
index 35ff8468a14..36836ed3691 100644
--- a/source/blender/editors/space_node/node_edit.cc
+++ b/source/blender/editors/space_node/node_edit.cc
@@ -745,7 +745,7 @@ void ED_node_set_active(
if (sima->pin) {
continue;
}
- if (ELEM(sima->image->type, IMA_TYPE_R_RESULT, IMA_TYPE_COMPOSITE)) {
+ if (sima->image && ELEM(sima->image->type, IMA_TYPE_R_RESULT, IMA_TYPE_COMPOSITE)) {
continue;
}
ED_space_image_set(bmain, sima, image, true);
More information about the Bf-blender-cvs
mailing list