[Bf-blender-cvs] [44cb138] master: Fix sconscript syntax error when using python 2.x instead of 3.x.

Brecht Van Lommel noreply at git.blender.org
Wed Jan 29 14:51:06 CET 2014


Commit: 44cb138cf20e6c874d84a2ba7cf4858fdfbfe9c8
Author: Brecht Van Lommel
Date:   Wed Jan 29 14:50:20 2014 +0100
https://developer.blender.org/rB44cb138cf20e6c874d84a2ba7cf4858fdfbfe9c8

Fix sconscript syntax error when using python 2.x instead of 3.x.

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

M	intern/cycles/SConscript

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

diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
index e05ecf4..b8c731e 100644
--- a/intern/cycles/SConscript
+++ b/intern/cycles/SConscript
@@ -89,7 +89,7 @@ elif env['OURPLATFORM'] == 'win64-vc':
     kernel_flags['sse2'] = '-D_CRT_SECURE_NO_WARNINGS /fp:fast /Ox /Gs-'
     kernel_flags['sse3'] = kernel_flags['sse2']
 
-    if env['MSVC_VERSION'] in {'11.0', '12.0'}:
+    if env['MSVC_VERSION'] in ('11.0', '12.0'):
         kernel_flags['sse41'] = kernel_flags['sse3']
         kernel_flags['avx'] = kernel_flags['sse41'] + ' /arch:AVX'
 else:




More information about the Bf-blender-cvs mailing list