[Bf-blender-cvs] [c751055] master: Cycles: Tweak to the include paths after recent atomics change

Sergey Sharybin noreply at git.blender.org
Tue Dec 2 12:53:32 CET 2014


Commit: c75105551344527538ac868a469b2ecd41fd79ce
Author: Sergey Sharybin
Date:   Tue Dec 2 16:52:11 2014 +0500
Branches: master
https://developer.blender.org/rBc75105551344527538ac868a469b2ecd41fd79ce

Cycles: Tweak to the include paths after recent atomics change

Who could knew that include directories are not inherited in scons..

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

M	intern/cycles/kernel/osl/SConscript

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

diff --git a/intern/cycles/kernel/osl/SConscript b/intern/cycles/kernel/osl/SConscript
index d721edb..723ab26 100644
--- a/intern/cycles/kernel/osl/SConscript
+++ b/intern/cycles/kernel/osl/SConscript
@@ -38,6 +38,7 @@ incs.append(env['BF_OIIO_INC'])
 incs.append(env['BF_BOOST_INC'])
 incs.append(env['BF_OSL_INC'])
 incs.append(env['BF_OPENEXR_INC'].split())
+incs.append('#/intern/atomic')
 
 defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
 defs.append('CCL_NAMESPACE_END=}')




More information about the Bf-blender-cvs mailing list