Merged changes in the trunk up to revision 53280.

2012-12-23 00:23:11 +00:00
parent fa0211df26 3ca00cbf54
commit 40449b1994
254 changed files with 20966 additions and 42617 deletions
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -95,9 +95,6 @@ if env['WITH_BF_COMPOSITOR']:
 if env['WITH_BF_CYCLES']:
    defs.append('WITH_CYCLES')

-if env['WITH_BF_CYCLES']:
-    defs.append('WITH_CYCLES')
-
 if env['WITH_BF_CYCLES_OSL']:
    defs.append('WITH_CYCLES_OSL')