resolved conflict state with HEAD r14096
[blender.git] / source / blender / nodes / SConscript
index cc7cde6fc266826910ae04269a857be105c6808c..8682f626b8043f490bb3952e78bb6035a09b2288 100644 (file)
@@ -41,6 +41,6 @@ if env['WITH_BF_QUICKTIME'] == 1:
     defs += ' WITH_QUICKTIME'
     incs += ' ' + env['BF_QUICKTIME_INC']
 
-defs += ' WITH_CCGSUBSURF USE_PYNODES '
+defs += ' WITH_CCGSUBSURF '
 
 env.BlenderLib ( libname = 'nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] )