Commit: f959e3d4bac148d95e3bc1dad481628b0fe1a994
Author: Brecht Van Lommel
Date: Thu Mar 13 14:16:42 2014 +0100
https://developer.blender.org/rBf959e3d4bac148d95e3bc1dad481628b0fe1a994
Fix T39146: recent cycles CUDA regression in fix for T39114.
This commit is to be backported to the 2.70 release.
===================================================================
M intern/cycles/render/tables.cpp
===================================================================
diff --git a/intern/cycles/render/tables.cpp b/intern/cycles/render/tables.cpp
index be0d4af..a8d502c 100644
--- a/intern/cycles/render/tables.cpp
+++ b/intern/cycles/render/tables.cpp
@@ -39,7 +39,10 @@ void LookupTables::device_update(Device *device, DeviceScene
*dscene)
if(!need_update)
return;
- device->tex_alloc("__lookup_table", dscene->lookup_table);
+ device->tex_free(dscene->lookup_table);
+
+ if(lookup_tables.size() > 0)
+ device->tex_alloc("__lookup_table", dscene->lookup_table);
need_update = false;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
