[Bf-blender-cvs] [49bd3d3a1a7] master: Cycles: Fix crash loading single channel texture

Sergey Sharybin noreply at git.blender.org
Thu May 18 15:52:51 CEST 2017


Commit: 49bd3d3a1a7364bc21c8127d2085aa7daaf25a54
Author: Sergey Sharybin
Date:   Thu May 18 15:49:03 2017 +0200
Branches: master
https://developer.blender.org/rB49bd3d3a1a7364bc21c8127d2085aa7daaf25a54

Cycles: Fix crash loading single channel texture

Was  typo in recent isfinite check.

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

M	intern/cycles/render/image.cpp

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

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index da020f4a48d..f4482e0bb25 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -672,7 +672,7 @@ bool ImageManager::file_load_image(Image *img,
 		}
 		else {
 			for(size_t i = 0; i < num_pixels; ++i) {
-				StorageType *pixel = &pixels[i*4];
+				StorageType *pixel = &pixels[i];
 				if(!isfinite(pixel[0])) {
 					pixel[0] = 0;
 				}




More information about the Bf-blender-cvs mailing list