[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28708] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28643 :28707
Brecht Van Lommel
brecht at blender.org
Mon May 10 12:32:48 CEST 2010
Revision: 28708
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28708
Author: blendix
Date: 2010-05-10 12:32:46 +0200 (Mon, 10 May 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28643:28707
Modified Paths:
--------------
branches/render25/CMakeLists.txt
branches/render25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/render25/release/scripts/modules/rna_prop_ui.py
branches/render25/release/scripts/ui/space_sequencer.py
branches/render25/source/blender/blenkernel/BKE_colortools.h
branches/render25/source/blender/blenkernel/BKE_sequencer.h
branches/render25/source/blender/blenkernel/intern/blender.c
branches/render25/source/blender/blenkernel/intern/colortools.c
branches/render25/source/blender/blenkernel/intern/image.c
branches/render25/source/blender/blenkernel/intern/sca.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenlib/intern/bpath.c
branches/render25/source/blender/blenloader/BLO_readfile.h
branches/render25/source/blender/blenloader/intern/readblenentry.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/editors/animation/anim_channels_edit.c
branches/render25/source/blender/editors/animation/anim_markers.c
branches/render25/source/blender/editors/armature/armature_ops.c
branches/render25/source/blender/editors/curve/curve_ops.c
branches/render25/source/blender/editors/datafiles/B.blend.c
branches/render25/source/blender/editors/interface/interface_draw.c
branches/render25/source/blender/editors/interface/interface_templates.c
branches/render25/source/blender/editors/interface/view2d_ops.c
branches/render25/source/blender/editors/mesh/mesh_data.c
branches/render25/source/blender/editors/mesh/mesh_ops.c
branches/render25/source/blender/editors/metaball/mball_ops.c
branches/render25/source/blender/editors/object/object_constraint.c
branches/render25/source/blender/editors/object/object_edit.c
branches/render25/source/blender/editors/object/object_ops.c
branches/render25/source/blender/editors/physics/physics_ops.c
branches/render25/source/blender/editors/space_action/action_ops.c
branches/render25/source/blender/editors/space_console/Makefile
branches/render25/source/blender/editors/space_console/SConscript
branches/render25/source/blender/editors/space_console/space_console.c
branches/render25/source/blender/editors/space_file/file_draw.c
branches/render25/source/blender/editors/space_file/file_intern.h
branches/render25/source/blender/editors/space_file/file_ops.c
branches/render25/source/blender/editors/space_file/filesel.c
branches/render25/source/blender/editors/space_file/space_file.c
branches/render25/source/blender/editors/space_graph/graph_ops.c
branches/render25/source/blender/editors/space_image/image_buttons.c
branches/render25/source/blender/editors/space_image/space_image.c
branches/render25/source/blender/editors/space_logic/logic_ops.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/editors/space_nla/nla_ops.c
branches/render25/source/blender/editors/space_node/node_ops.c
branches/render25/source/blender/editors/space_outliner/outliner_ops.c
branches/render25/source/blender/editors/space_sequencer/sequencer_edit.c
branches/render25/source/blender/editors/space_sequencer/sequencer_ops.c
branches/render25/source/blender/editors/space_sequencer/space_sequencer.c
branches/render25/source/blender/editors/space_text/space_text.c
branches/render25/source/blender/editors/space_view3d/drawobject.c
branches/render25/source/blender/editors/space_view3d/space_view3d.c
branches/render25/source/blender/editors/transform/transform.c
branches/render25/source/blender/editors/transform/transform_conversions.c
branches/render25/source/blender/imbuf/CMakeLists.txt
branches/render25/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/render25/source/blender/makesdna/DNA_actuator_types.h
branches/render25/source/blender/makesdna/DNA_color_types.h
branches/render25/source/blender/makesdna/DNA_space_types.h
branches/render25/source/blender/makesrna/RNA_access.h
branches/render25/source/blender/makesrna/RNA_define.h
branches/render25/source/blender/makesrna/intern/rna_access.c
branches/render25/source/blender/makesrna/intern/rna_actuator.c
branches/render25/source/blender/makesrna/intern/rna_color.c
branches/render25/source/blender/makesrna/intern/rna_constraint.c
branches/render25/source/blender/makesrna/intern/rna_controller.c
branches/render25/source/blender/makesrna/intern/rna_define.c
branches/render25/source/blender/makesrna/intern/rna_internal.h
branches/render25/source/blender/makesrna/intern/rna_main.c
branches/render25/source/blender/makesrna/intern/rna_main_api.c
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blender/makesrna/intern/rna_property.c
branches/render25/source/blender/makesrna/intern/rna_sensor.c
branches/render25/source/blender/makesrna/intern/rna_sequencer.c
branches/render25/source/blender/python/doc/sphinx_doc_gen.py
branches/render25/source/blender/python/intern/bpy_props.c
branches/render25/source/blender/python/intern/bpy_props.h
branches/render25/source/blender/python/intern/bpy_rna.c
branches/render25/source/blender/render/intern/source/result.c
branches/render25/source/blenderplayer/CMakeLists.txt
Property Changed:
----------------
branches/render25/source/blender/imbuf/intern/IMB_filetype.h
branches/render25/source/blender/imbuf/intern/cache.c
branches/render25/source/blender/imbuf/intern/filetype.c
branches/render25/source/blender/imbuf/intern/module.c
Modified: branches/render25/CMakeLists.txt
===================================================================
--- branches/render25/CMakeLists.txt 2010-05-10 10:21:38 UTC (rev 28707)
+++ branches/render25/CMakeLists.txt 2010-05-10 10:32:46 UTC (rev 28708)
@@ -62,7 +62,6 @@
OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
OPTION(WITH_ELBEEM "Enable Elbeem (Fluid Simulation)" ON)
-OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF)
OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
OPTION(WITH_DDS "Enable DDS Support" ON)
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
@@ -79,17 +78,22 @@
OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
OPTION(WITH_BUILDINFO "Include extra build details" ON)
OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
-OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" ON)
+OPTION(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" OFF)
+IF(APPLE OR WIN32)
+ OPTION(WITH_QUICKTIME "Enable Quicktime Support" OFF)
+ENDIF(APPLE OR WIN32)
+
# Unix defaults to OpenMP On
+# Disable opencollada on non-apple unix because opencollada has no package for debian
IF(UNIX AND NOT APPLE)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
-ELSE(UNIX AND NOT APPLE)
+ OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF)
+ELSE()
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
-ENDIF(UNIX AND NOT APPLE)
+ OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" ON)
+ENDIF()
-OPTION(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" OFF)
-
IF (APPLE)
OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
OPTION(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
Modified: branches/render25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj 2010-05-10 10:21:38 UTC (rev 28707)
+++ branches/render25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj 2010-05-10 10:32:46 UTC (rev 28708)
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds;..\..\..\source\blender\windowmanager;..\..\..\source\blender\makesrna"
+ AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds;..\..\..\source\blender\windowmanager;..\..\..\source\blender\makesrna"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;WITH_DDS;WITH_FFMPEG"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -118,7 +118,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds;..\..\..\source\blender\windowmanager;..\..\..\source\blender\makesrna"
+ AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds;..\..\..\source\blender\windowmanager;..\..\..\source\blender\makesrna"
PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -192,7 +192,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds;..\..\..\source\blender\windowmanager;..\..\..\source\blender\makesrna"
+ AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\lib\windows\ffmpeg\include\msvc;..\..\..\..\build\msvc_9\intern\memutil\include;..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds;..\..\..\source\blender\windowmanager;..\..\..\source\blender\makesrna"
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_QUICKTIME"
StringPooling="true"
RuntimeLibrary="2"
@@ -268,7 +268,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list