[Bf-blender-cvs] [7c6689b] testbuild: Cycles: Fix wrong image update tagging, float vs. byte images
Sergey Sharybin
noreply at git.blender.org
Fri Aug 22 15:13:46 CEST 2014
Commit: 7c6689b9854d1ba005c2bdb8df21fb40100c8d30
Author: Sergey Sharybin
Date: Fri Aug 22 17:36:00 2014 +0600
Branches: testbuild
https://developer.blender.org/rB7c6689b9854d1ba005c2bdb8df21fb40100c8d30
Cycles: Fix wrong image update tagging, float vs. byte images
===================================================================
M intern/cycles/render/image.cpp
===================================================================
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index f84396a..5ab9d81 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -332,7 +332,7 @@ void ImageManager::tag_reload_image(const string& filename, void *builtin_data,
/* see if it's in a float texture slot */
for(slot = 0; slot < float_images.size(); slot++) {
if(float_images[slot] && image_equals(float_images[slot], filename, builtin_data, interpolation)) {
- images[slot]->need_load = true;
+ float_images[slot]->need_load = true;
break;
}
}
More information about the Bf-blender-cvs
mailing list