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
path: root/intern
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-02-14 23:30:25 +0400
committerThomas Dinges <blender@dingto.org>2013-02-14 23:30:25 +0400
commitcb75d64f7d223e55e257278b8d0acd62ffeea882 (patch)
treec8583dbceabc4172074cb70acc240d5f190f780c /intern
parent10305de3ac27ec7d247120a62d5ef7508e7a165e (diff)
Cycles:
* Compile fix when building without OSL.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/render/mesh.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 3a6fba32b34..8d12ace4252 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -967,6 +967,7 @@ void MeshManager::device_free(Device *device, DeviceScene *dscene)
dscene->attributes_float.clear();
dscene->attributes_float3.clear();
+#ifdef WITH_OSL
OSLGlobals *og = (OSLGlobals*)device->osl_memory();
if(og) {
@@ -974,6 +975,7 @@ void MeshManager::device_free(Device *device, DeviceScene *dscene)
og->attribute_map.clear();
og->object_names.clear();
}
+#endif
}
void MeshManager::tag_update(Scene *scene)