[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54562] trunk/blender/intern/cycles/render /mesh.cpp: Cycles:
Thomas Dinges
blender at dingto.org
Thu Feb 14 20:30:25 CET 2013
Revision: 54562
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54562
Author: dingto
Date: 2013-02-14 19:30:25 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
Cycles:
* Compile fix when building without OSL.
Modified Paths:
--------------
trunk/blender/intern/cycles/render/mesh.cpp
Modified: trunk/blender/intern/cycles/render/mesh.cpp
===================================================================
--- trunk/blender/intern/cycles/render/mesh.cpp 2013-02-14 19:19:44 UTC (rev 54561)
+++ trunk/blender/intern/cycles/render/mesh.cpp 2013-02-14 19:30:25 UTC (rev 54562)
@@ -967,6 +967,7 @@
dscene->attributes_float.clear();
dscene->attributes_float3.clear();
+#ifdef WITH_OSL
OSLGlobals *og = (OSLGlobals*)device->osl_memory();
if(og) {
@@ -974,6 +975,7 @@
og->attribute_map.clear();
og->object_names.clear();
}
+#endif
}
void MeshManager::tag_update(Scene *scene)
More information about the Bf-blender-cvs
mailing list