[Bf-blender-cvs] [3c07967ef28] master: Fix Cycles crash when trying to load image that does not exist

Brecht Van Lommel noreply at git.blender.org
Fri May 3 19:46:19 CEST 2019


Commit: 3c07967ef28e5928049647daa0673f9db91d083f
Author: Brecht Van Lommel
Date:   Fri May 3 19:07:22 2019 +0200
Branches: master
https://developer.blender.org/rB3c07967ef28e5928049647daa0673f9db91d083f

Fix Cycles crash when trying to load image that does not exist

It was crashing due to array out of bounds access. This is not a great fix,
but brings back behavior the same as before now. Perhaps images that failed
to load should be stored separately somewhere.

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

M	intern/cycles/render/image.h

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

diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index d5bc37e58d7..c05a65f6c3e 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -57,7 +57,7 @@ class ImageMetaData {
         height(0),
         depth(0),
         builtin_free_cache(NULL),
-        type(IMAGE_DATA_NUM_TYPES),
+        type((ImageDataType)0),
         colorspace(u_colorspace_raw),
         compress_as_srgb(false)
   {



More information about the Bf-blender-cvs mailing list