Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2014-03-13 17:16:42 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-03-13 17:18:34 +0400
commitf959e3d4bac148d95e3bc1dad481628b0fe1a994 (patch)
treecb72f89435f9d4df9310c226c6d69c6577bb14c1 /intern/cycles/render/tables.cpp
parent23fd670c39ac6f631e6826988b65a6f1a99b536d (diff)
Fix T39146: recent cycles CUDA regression in fix for T39114.
This commit is to be backported to the 2.70 release.
Diffstat (limited to 'intern/cycles/render/tables.cpp')
-rw-r--r--intern/cycles/render/tables.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/render/tables.cpp b/intern/cycles/render/tables.cpp
index be0d4afbe2c..a8d502c432d 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;
}