[Bf-blender-cvs] [d3a7f3f] master: Cycles: Forgot to set WITH_CYCLES_DEBUG for OSL kernel

Sergey Sharybin noreply at git.blender.org
Sun Oct 5 17:43:58 CEST 2014


Commit: d3a7f3fa296d1676a188f69741d6beb0a0052605
Author: Sergey Sharybin
Date:   Sun Oct 5 17:43:27 2014 +0200
Branches: master
https://developer.blender.org/rBd3a7f3fa296d1676a188f69741d6beb0a0052605

Cycles: Forgot to set WITH_CYCLES_DEBUG for OSL kernel

===================================================================

M	intern/cycles/kernel/osl/SConscript

===================================================================

diff --git a/intern/cycles/kernel/osl/SConscript b/intern/cycles/kernel/osl/SConscript
index 4685bb7..d721edb 100644
--- a/intern/cycles/kernel/osl/SConscript
+++ b/intern/cycles/kernel/osl/SConscript
@@ -43,6 +43,9 @@ defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
 defs.append('CCL_NAMESPACE_END=}')
 defs.append('WITH_OSL')
 
+if env['WITH_BF_CYCLES_DEBUG']:
+    defs.append('WITH_CYCLES_DEBUG')
+
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
     cxxflags.append('-DBOOST_NO_RTTI -DBOOST_NO_TYPEID /fp:fast'.split())
     incs.append(env['BF_PTHREADS_INC'])




More information about the Bf-blender-cvs mailing list