[Bf-blender-cvs] [4a11c0aabb0] master: Fix regression: crash with uv constrain to bounds without image

Chris Blackbourn noreply at git.blender.org
Mon Aug 15 05:06:22 CEST 2022


Commit: 4a11c0aabb0d9a01a6e16ab290adb3df4ee1db58
Author: Chris Blackbourn
Date:   Sat Aug 13 18:10:44 2022 +1200
Branches: master
https://developer.blender.org/rB4a11c0aabb0d9a01a6e16ab290adb3df4ee1db58

Fix regression: crash with uv constrain to bounds without image

Merge confusion between cc1daa9b766d and 0d62e963b06e.

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

M	source/blender/blenkernel/intern/image.cc

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

diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc
index d915a9db76c..3e5d997c873 100644
--- a/source/blender/blenkernel/intern/image.cc
+++ b/source/blender/blenkernel/intern/image.cc
@@ -926,7 +926,7 @@ int BKE_image_find_nearest_tile_with_offset(const Image *image,
   zero_v2(r_uv_offset);
   int tile_number_best = -1;
 
-  if (image->source != IMA_SRC_TILED) {
+  if (!image || image->source != IMA_SRC_TILED) {
     return tile_number_best;
   }



More information about the Bf-blender-cvs mailing list