[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55849] trunk/blender: Additional missing files in revision 55847...

[Tamito Kajiyama]

Revision: 55849
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55849
Author:   kjym3
Date:     2013-04-06 16:48:41 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Additional missing files in revision 55847...

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

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/SConstruct

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-04-06 16:42:33 UTC (rev 55848)
+++ trunk/blender/CMakeLists.txt	2013-04-06 16:48:41 UTC (rev 55849)
@@ -240,6 +240,9 @@
 # Camera/motion tracking
 option(WITH_LIBMV         "Enable libmv structure from motion library" ON)
 
+# Freestyle
+option(WITH_FREESTYLE     "Enable Freestyle (advanced edges rendering)" ON)
+
 # Misc
 option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
 option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON)

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2013-04-06 16:42:33 UTC (rev 55848)
+++ trunk/blender/SConstruct	2013-04-06 16:48:41 UTC (rev 55849)
@@ -269,6 +269,7 @@
     target_env_defs['WITH_BF_PYTHON'] = False
     target_env_defs['WITH_BF_3DMOUSE'] = False
     target_env_defs['WITH_BF_LIBMV'] = False
+    target_env_defs['WITH_BF_FREESTYLE'] = False
 
     # Merge blenderlite, let command line to override
     for k,v in target_env_defs.iteritems():
@@ -715,6 +716,10 @@
                 if VERSION_RELEASE_CYCLE == "release" and "addons_contrib" in dn:
                     dn.remove('addons_contrib')
 
+                # do not install freestyle if disabled
+                if not env['WITH_BF_FREESTYLE'] and "freestyle" in dn:
+                    dn.remove("freestyle")
+
                 dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
                 dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]