[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28721] branches/soc-2010-kwk: merge 28648 :28720

Konrad Kleine konrad at konradwilhelm.de
Mon May 10 21:39:43 CEST 2010


Revision: 28721
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28721
Author:   kwk
Date:     2010-05-10 21:39:43 +0200 (Mon, 10 May 2010)

Log Message:
-----------
merge 28648:28720

Modified Paths:
--------------
    branches/soc-2010-kwk/CMakeLists.txt
    branches/soc-2010-kwk/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
    branches/soc-2010-kwk/release/scripts/modules/rna_prop_ui.py
    branches/soc-2010-kwk/release/scripts/op/presets.py
    branches/soc-2010-kwk/release/scripts/ui/space_sequencer.py
    branches/soc-2010-kwk/release/scripts/ui/space_userpref.py
    branches/soc-2010-kwk/release/scripts/ui/space_view3d.py
    branches/soc-2010-kwk/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2010-kwk/source/blender/blenkernel/BKE_image.h
    branches/soc-2010-kwk/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2010-kwk/source/blender/blenkernel/intern/blender.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/bmfont.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/colortools.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/image.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/sca.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/writeavi.c
    branches/soc-2010-kwk/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2010-kwk/source/blender/blenlib/BLI_path_util.h
    branches/soc-2010-kwk/source/blender/blenlib/BLI_storage.h
    branches/soc-2010-kwk/source/blender/blenlib/intern/bpath.c
    branches/soc-2010-kwk/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2010-kwk/source/blender/blenlib/intern/path_util.c
    branches/soc-2010-kwk/source/blender/blenlib/intern/storage.c
    branches/soc-2010-kwk/source/blender/blenloader/BLO_readfile.h
    branches/soc-2010-kwk/source/blender/blenloader/intern/readblenentry.c
    branches/soc-2010-kwk/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-kwk/source/blender/blenpluginapi/iff.h
    branches/soc-2010-kwk/source/blender/blenpluginapi/intern/pluginapi.c
    branches/soc-2010-kwk/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2010-kwk/source/blender/editors/animation/anim_markers.c
    branches/soc-2010-kwk/source/blender/editors/armature/armature_ops.c
    branches/soc-2010-kwk/source/blender/editors/curve/curve_intern.h
    branches/soc-2010-kwk/source/blender/editors/curve/curve_ops.c
    branches/soc-2010-kwk/source/blender/editors/curve/editcurve.c
    branches/soc-2010-kwk/source/blender/editors/datafiles/B.blend.c
    branches/soc-2010-kwk/source/blender/editors/include/ED_curve.h
    branches/soc-2010-kwk/source/blender/editors/interface/interface_draw.c
    branches/soc-2010-kwk/source/blender/editors/interface/interface_icons.c
    branches/soc-2010-kwk/source/blender/editors/interface/interface_templates.c
    branches/soc-2010-kwk/source/blender/editors/interface/view2d_ops.c
    branches/soc-2010-kwk/source/blender/editors/mesh/mesh_data.c
    branches/soc-2010-kwk/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2010-kwk/source/blender/editors/metaball/mball_ops.c
    branches/soc-2010-kwk/source/blender/editors/object/object_edit.c
    branches/soc-2010-kwk/source/blender/editors/object/object_ops.c
    branches/soc-2010-kwk/source/blender/editors/physics/physics_ops.c
    branches/soc-2010-kwk/source/blender/editors/screen/screendump.c
    branches/soc-2010-kwk/source/blender/editors/space_action/action_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_console/Makefile
    branches/soc-2010-kwk/source/blender/editors/space_console/SConscript
    branches/soc-2010-kwk/source/blender/editors/space_console/space_console.c
    branches/soc-2010-kwk/source/blender/editors/space_file/file_draw.c
    branches/soc-2010-kwk/source/blender/editors/space_file/file_intern.h
    branches/soc-2010-kwk/source/blender/editors/space_file/file_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_file/filelist.c
    branches/soc-2010-kwk/source/blender/editors/space_file/filesel.c
    branches/soc-2010-kwk/source/blender/editors/space_file/space_file.c
    branches/soc-2010-kwk/source/blender/editors/space_file/writeimage.c
    branches/soc-2010-kwk/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_image/image_buttons.c
    branches/soc-2010-kwk/source/blender/editors/space_image/space_image.c
    branches/soc-2010-kwk/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_logic/logic_window.c
    branches/soc-2010-kwk/source/blender/editors/space_nla/nla_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_node/node_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_outliner/outliner_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2010-kwk/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2010-kwk/source/blender/editors/space_text/space_text.c
    branches/soc-2010-kwk/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-kwk/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2010-kwk/source/blender/imbuf/CMakeLists.txt
    branches/soc-2010-kwk/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2010-kwk/source/blender/imbuf/IMB_imbuf_types.h
    branches/soc-2010-kwk/source/blender/imbuf/IMB_thumbs.h
    branches/soc-2010-kwk/source/blender/imbuf/SConscript
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_anim.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_filter.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/allocimbuf.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/anim.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/bmp.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/cineon/cineon_dpx.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/dds/dds_api.cpp
    branches/soc-2010-kwk/source/blender/imbuf/intern/dds/dds_api.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/divers.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/dynlibtiff.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/dynlibtiff.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/filter.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/imageprocess.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/imbuf.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/imbuf_cocoa.m
    branches/soc-2010-kwk/source/blender/imbuf/intern/iris.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/jp2.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/jpeg.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2010-kwk/source/blender/imbuf/intern/openexr/openexr_api.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/png.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/radiance_hdr.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/readimage.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/rectop.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/rotate.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/scaling.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/targa.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/thumbs.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/tiff.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/util.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/writeimage.c
    branches/soc-2010-kwk/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2010-kwk/source/blender/makesdna/DNA_color_types.h
    branches/soc-2010-kwk/source/blender/makesdna/DNA_image_types.h
    branches/soc-2010-kwk/source/blender/makesdna/DNA_space_types.h
    branches/soc-2010-kwk/source/blender/makesrna/RNA_access.h
    branches/soc-2010-kwk/source/blender/makesrna/RNA_define.h
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_access.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_color.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_define.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_image.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_main.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_object.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_property.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2010-kwk/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-kwk/source/blender/python/intern/bpy_props.c
    branches/soc-2010-kwk/source/blender/python/intern/bpy_props.h
    branches/soc-2010-kwk/source/blender/python/intern/bpy_rna.c
    branches/soc-2010-kwk/source/blender/quicktime/apple/qtkit_import.m
    branches/soc-2010-kwk/source/blender/quicktime/apple/quicktime_import.c
    branches/soc-2010-kwk/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2010-kwk/source/blenderplayer/CMakeLists.txt
    branches/soc-2010-kwk/source/creator/creator.c
    branches/soc-2010-kwk/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2010-kwk/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

Added Paths:
-----------
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_filetype.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_metadata.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/cache.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/filetype.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/metadata.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/module.c

Removed Paths:
-------------
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_amiga.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_anim5.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_bitplanes.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_bmp.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_cmap.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_cocoa.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_divers.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_dpxcineon.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_ham.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_hamx.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_iff.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_imginfo.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_iris.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_jp2.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_jpeg.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_png.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_radiance_hdr.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_targa.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/IMB_tiff.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/amiga.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/anim5.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/antialias.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/bitplanes.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/cmap.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/cspace.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/data.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/dither.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/gen_dynlibtiff.py
    branches/soc-2010-kwk/source/blender/imbuf/intern/ham.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/hamx.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/iff.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/imbuf_patch.h
    branches/soc-2010-kwk/source/blender/imbuf/intern/imginfo.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/matrix.h

Modified: branches/soc-2010-kwk/CMakeLists.txt
===================================================================
--- branches/soc-2010-kwk/CMakeLists.txt	2010-05-10 18:47:03 UTC (rev 28720)
+++ branches/soc-2010-kwk/CMakeLists.txt	2010-05-10 19:39:43 UTC (rev 28721)
@@ -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-kwk/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
===================================================================
--- branches/soc-2010-kwk/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj	2010-05-10 18:47:03 UTC (rev 28720)
+++ branches/soc-2010-kwk/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj	2010-05-10 19:39:43 UTC (rev 28721)
@@ -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