Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2011-07-27 11:42:53 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2011-07-27 11:42:53 +0400
commit73a9ce7ec04bd1170b292c8f2c83a8c5c10a95ad (patch)
treecfc0637d68339e9b4cd45de49aa30d585748717b /CMakeLists.txt
parentf54068719f8f1965ffd3584f9f8ad53b3c7f9602 (diff)
svn merge -r38558:38752 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 764e9f93414..9f833aef31e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,6 +155,7 @@ option(WITH_IMAGE_DDS "Enable DDS Image Support" ON)
option(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON)
option(WITH_IMAGE_HDR "Enable HDR Image Support" ON)
option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" OFF)
+option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for rendering" ON)
# Audio/Video format support
option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)