[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56844] tags/blender-2.67a-release/blender : svn merge ^/trunk/blender -r56533:56534

[Campbell Barton]

Revision: 56844
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56844
Author:   campbellbarton
Date:     2013-05-16 09:57:05 +0000 (Thu, 16 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -r56533:56534

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56533

Modified Paths:
--------------
    tags/blender-2.67a-release/blender/build_files/buildbot/config/user-config-mac-i386.py
    tags/blender-2.67a-release/blender/build_files/buildbot/config/user-config-mac-x86_64.py
    tags/blender-2.67a-release/blender/source/blender/windowmanager/WM_keymap.h

Property Changed:
----------------
    tags/blender-2.67a-release/blender/


Property changes on: tags/blender-2.67a-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56529-56532,56537-56539,56572,56577,56581,56601,56605-56606
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606

Modified: tags/blender-2.67a-release/blender/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- tags/blender-2.67a-release/blender/build_files/buildbot/config/user-config-mac-i386.py	2013-05-16 09:54:49 UTC (rev 56843)
+++ tags/blender-2.67a-release/blender/build_files/buildbot/config/user-config-mac-i386.py	2013-05-16 09:57:05 UTC (rev 56844)
@@ -317,6 +317,9 @@
 BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
 BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
 
+#Freestyle
+WITH_BF_FREESTYLE = True
+
 #Ray trace optimization
 if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
     WITH_BF_RAYOPTIMIZATION = True

Modified: tags/blender-2.67a-release/blender/build_files/buildbot/config/user-config-mac-x86_64.py
===================================================================
--- tags/blender-2.67a-release/blender/build_files/buildbot/config/user-config-mac-x86_64.py	2013-05-16 09:54:49 UTC (rev 56843)
+++ tags/blender-2.67a-release/blender/build_files/buildbot/config/user-config-mac-x86_64.py	2013-05-16 09:57:05 UTC (rev 56844)
@@ -317,6 +317,9 @@
 BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
 BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
 
+#Freestyle
+WITH_BF_FREESTYLE = True
+
 #Ray trace optimization
 if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
     WITH_BF_RAYOPTIMIZATION = True

Modified: tags/blender-2.67a-release/blender/source/blender/windowmanager/WM_keymap.h
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/windowmanager/WM_keymap.h	2013-05-16 09:54:49 UTC (rev 56843)
+++ tags/blender-2.67a-release/blender/source/blender/windowmanager/WM_keymap.h	2013-05-16 09:57:05 UTC (rev 56844)
@@ -32,6 +32,7 @@
 
 /* dna-savable wmStructs here */
 #include "DNA_windowmanager_types.h"
+#include "BLI_utildefines.h"
 
 #ifdef __cplusplus
 extern "C" {