[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28754] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28663 :28753

Nicholas Bishop nicholasbishop at gmail.com
Fri May 14 03:42:43 CEST 2010 

Revision: 28754
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28754
Author:   nicholasbishop
Date:     2010-05-14 03:42:42 +0200 (Fri, 14 May 2010)

Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28663:28753

Modified Paths:
--------------
    branches/soc-2010-nicolasbishop/CMakeLists.txt
    branches/soc-2010-nicolasbishop/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
    branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/utils.py
    branches/soc-2010-nicolasbishop/release/scripts/modules/rna_prop_ui.py
    branches/soc-2010-nicolasbishop/release/scripts/op/presets.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/properties_particle.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_cloth.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_common.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_smoke.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_softbody.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_node.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_sequencer.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_text.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py
    branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d.py
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/blender.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/colortools.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/displist.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/image.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/multires.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_bpath.h
    branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_string.h
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/BLI_dynstr.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/bpath.c
    branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/string.c
    branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_filter.c
    branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_markers.c
    branches/soc-2010-nicolasbishop/source/blender/editors/armature/armature_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/curve/curve_intern.h
    branches/soc-2010-nicolasbishop/source/blender/editors/curve/curve_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/curve/editcurve.c
    branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/B.blend.c
    branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_curve.h
    branches/soc-2010-nicolasbishop/source/blender/editors/include/UI_view2d.h
    branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_draw.c
    branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_templates.c
    branches/soc-2010-nicolasbishop/source/blender/editors/interface/view2d.c
    branches/soc-2010-nicolasbishop/source/blender/editors/mesh/mesh_data.c
    branches/soc-2010-nicolasbishop/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/metaball/mball_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/object/object_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/object/object_intern.h
    branches/soc-2010-nicolasbishop/source/blender/editors/object/object_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/object/object_select.c
    branches/soc-2010-nicolasbishop/source/blender/editors/physics/physics_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_action/action_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_console/Makefile
    branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_draw.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_intern.h
    branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_file/filesel.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_file/space_file.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_buttons.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_image/space_image.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_window.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_intern.h
    branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_select.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_node/space_node.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_outliner/outliner_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_text/space_text.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_color_types.h
    branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_object_types.h
    branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_sensor_types.h
    branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_space_types.h
    branches/soc-2010-nicolasbishop/source/blender/makesrna/RNA_access.h
    branches/soc-2010-nicolasbishop/source/blender/makesrna/RNA_define.h
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_access.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_color.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_define.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_property.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2010-nicolasbishop/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy.c
    branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_props.c
    branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_props.h
    branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.c

Modified: branches/soc-2010-nicolasbishop/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/CMakeLists.txt	2010-05-13 19:23:52 UTC (rev 28753)
+++ branches/soc-2010-nicolasbishop/CMakeLists.txt	2010-05-14 01:42:42 UTC (rev 28754)
@@ -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)
+	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)
+	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/soc-2010-nicolasbishop/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
===================================================================
--- branches/soc-2010-nicolasbishop/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj	2010-05-13 19:23:52 UTC (rev 28753)
+++ branches/soc-2010-nicolasbishop/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj	2010-05-14 01:42:42 UTC (rev 28754)
@@ -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