merge with/from trunk at r35190
[blender.git] / source / gameengine / VideoTexture / SConscript
index 2cd143d2deb1630cbbf61cddcd68393573db543b..94209f858232a2e2178cf96467bd031ef6b456a6 100644 (file)
@@ -20,8 +20,14 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw'):
         defs.append('_DEBUG')
 
 if env['WITH_BF_PYTHON']:
+<<<<<<< .working
+    incs += ' ' + env['BF_PYTHON_INC']
+else:
+    defs.append('DISABLE_PYTHON')
+=======
     incs += ' ' + env['BF_PYTHON_INC']
     defs.append('WITH_PYTHON')
+>>>>>>> .merge-right.r35190
 
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')