[Bf-blender-cvs] [05f15645ec9] master: Cleanup: missing NULL check in assert

Campbell Barton noreply at git.blender.org
Wed Jun 9 18:23:50 CEST 2021


Commit: 05f15645ec9b6d7a1812b0a5463e6135f1172e97
Author: Campbell Barton
Date:   Thu Jun 10 01:55:47 2021 +1000
Branches: master
https://developer.blender.org/rB05f15645ec9b6d7a1812b0a5463e6135f1172e97

Cleanup: missing NULL check in assert

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

M	source/blender/editors/interface/interface_eyedropper_color.c

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

diff --git a/source/blender/editors/interface/interface_eyedropper_color.c b/source/blender/editors/interface/interface_eyedropper_color.c
index 6583fa31dbf..ba72cecc514 100644
--- a/source/blender/editors/interface/interface_eyedropper_color.c
+++ b/source/blender/editors/interface/interface_eyedropper_color.c
@@ -234,7 +234,7 @@ static bool eyedropper_cryptomatte_sample_image_fl(const bNode *node,
 {
   bool success = false;
   Image *image = (Image *)node->id;
-  BLI_assert(GS(image->id.name) == ID_IM);
+  BLI_assert((image == NULL) || (GS(image->id.name) == ID_IM));
   ImageUser *iuser = &crypto->iuser;
 
   if (image && image->type == IMA_TYPE_MULTILAYER) {



More information about the Bf-blender-cvs mailing list