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@pandora.be>2013-06-28 17:05:21 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-28 17:05:21 +0400
commit54b197695859f351f2116c40354f92a24baeb4e6 (patch)
treeeca94040cb464c4d7c8699f60d443b345a9b7abe /intern/cycles/render/background.h
parent0d7dbbb6e1fc0bb85d236ca1e04ff966f4ad39c9 (diff)
Fix #35896: cycles crash with OSL image textures and viewport + preview render
running at the same time.
Diffstat (limited to 'intern/cycles/render/background.h')
-rw-r--r--intern/cycles/render/background.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/render/background.h b/intern/cycles/render/background.h
index e0c0c42de37..ffedfbe3da3 100644
--- a/intern/cycles/render/background.h
+++ b/intern/cycles/render/background.h
@@ -35,6 +35,7 @@ public:
bool use;
uint visibility;
+ uint shader;
bool transparent;
bool need_update;