[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27416] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27381 :27415
Brecht Van Lommel
brecht at blender.org
Thu Mar 11 17:40:30 CET 2010
Revision: 27416
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27416
Author: blendix
Date: 2010-03-11 17:40:30 +0100 (Thu, 11 Mar 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27381:27415
Modified Paths:
--------------
branches/render25/intern/ghost/make/msvc_9_0/ghost.vcproj
branches/render25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/render25/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/render25/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
branches/render25/release/scripts/io/export_fbx.py
branches/render25/release/scripts/ui/properties_data_lamp.py
branches/render25/release/scripts/ui/properties_texture.py
branches/render25/source/blender/blenkernel/BKE_object.h
branches/render25/source/blender/blenkernel/intern/anim.c
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/blenkernel/intern/texture.c
branches/render25/source/blender/blenlib/SConscript
branches/render25/source/blender/collada/DocumentExporter.cpp
branches/render25/source/blender/editors/armature/poseobject.c
branches/render25/source/blender/editors/include/ED_fileselect.h
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/object/object_edit.c
branches/render25/source/blender/editors/render/render_intern.h
branches/render25/source/blender/editors/render/render_ops.c
branches/render25/source/blender/editors/render/render_shading.c
branches/render25/source/blender/editors/screen/area.c
branches/render25/source/blender/editors/sculpt_paint/paint_image.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/filelist.c
branches/render25/source/blender/editors/space_file/filelist.h
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_file/writeimage.c
branches/render25/source/blender/editors/space_view3d/view3d_draw.c
branches/render25/source/blender/editors/transform/transform_conversions.c
branches/render25/source/blender/imbuf/IMB_thumbs.h
branches/render25/source/blender/imbuf/intern/thumbs.c
branches/render25/source/blender/makesdna/DNA_action_types.h
branches/render25/source/blender/makesrna/RNA_access.h
branches/render25/source/blender/makesrna/intern/rna_access.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/blender/makesrna/intern/rna_texture.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
branches/render25/source/blender/python/intern/bpy_props.c
branches/render25/source/blender/python/intern/bpy_rna.c
branches/render25/source/blender/render/intern/include/camera.h
branches/render25/source/blender/render/intern/source/camera.c
branches/render25/source/blender/render/intern/source/convertblender.c
branches/render25/source/blender/render/intern/source/halo.c
branches/render25/source/blender/render/intern/source/lamp.c
branches/render25/source/blender/render/intern/source/object_halo.c
branches/render25/source/blender/render/intern/source/part.c
branches/render25/source/blender/render/intern/source/pipeline.c
branches/render25/source/blender/render/intern/source/shadeinput.c
branches/render25/source/blender/render/intern/source/shadowbuf.c
branches/render25/source/blender/render/intern/source/texture_envmap.c
branches/render25/source/blender/windowmanager/WM_api.h
branches/render25/source/blender/windowmanager/intern/wm_jobs.c
branches/render25/source/blenderplayer/bad_level_call_stubs/SConscript
Added Paths:
-----------
branches/render25/release/scripts/presets/render/D16.py
branches/render25/release/scripts/presets/render/D4.py
branches/render25/release/scripts/presets/render/DVCPRO_HD_1080p.py
branches/render25/release/scripts/presets/render/DVCPRO_HD_720p.py
branches/render25/release/scripts/presets/render/HDV_1080p.py
branches/render25/release/scripts/presets/render/SXGA.py
branches/render25/release/scripts/presets/render/TV_NTSC(D1)_16_colon_9.py
branches/render25/release/scripts/presets/render/TV_NTSC(D1)_4_colon_3.py
branches/render25/release/scripts/presets/render/TV_NTSC(DV)_16_colon_9.py
branches/render25/release/scripts/presets/render/TV_NTSC(DV)_4_colon_3.py
branches/render25/release/scripts/presets/render/TV_PAL_4_colon_3.py
branches/render25/release/scripts/presets/render/WSXGA+.py
branches/render25/release/scripts/presets/render/WSXGA.py
branches/render25/release/scripts/presets/render/XGA.py
Modified: branches/render25/intern/ghost/make/msvc_9_0/ghost.vcproj
===================================================================
--- branches/render25/intern/ghost/make/msvc_9_0/ghost.vcproj 2010-03-11 16:11:25 UTC (rev 27415)
+++ branches/render25/intern/ghost/make/msvc_9_0/ghost.vcproj 2010-03-11 16:40:30 UTC (rev 27416)
@@ -44,7 +44,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE;..\..\..\..\..\build\msvc_9\extern\glew\include"
+ AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\makesdna"
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
StringPooling="true"
RuntimeLibrary="0"
@@ -197,7 +197,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE;..\..\..\..\..\build\msvc_9\extern\glew\include"
+ AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\makesdna"
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
StringPooling="true"
RuntimeLibrary="2"
@@ -273,7 +273,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE;..\..\..\..\..\build\msvc_9\extern\glew\include"
+ AdditionalIncludeDirectories="..\..;..\..\..\..\..\build\msvc_9\intern\string\include;..\..\..\..\..\lib\windows\wintab\INCLUDE;..\..\..\..\..\build\msvc_9\extern\glew\include;..\..\..\..\source\blender\imbuf;..\..\..\..\source\blender\makesdna"
PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Modified: branches/render25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2010-03-11 16:11:25 UTC (rev 27415)
+++ branches/render25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj 2010-03-11 16:40:30 UTC (rev 27416)
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -140,7 +140,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE;GAMEBLENDER=1;WITH_SDL;WITH_OPENAL;WITH_JACK"
StringPooling="true"
RuntimeLibrary="0"
@@ -233,7 +233,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
@@ -422,7 +422,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE;GAMEBLENDER=1;WITH_SDL;WITH_OPENAL;WITH_JACK"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -518,7 +518,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\editors\include;..\..\..\source\blender\blenkernel;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\gpu;..\..\..\source\blender\windowmanager;..\..\..\source\blender\imbuf"
PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE;GAMEBLENDER=1;WITH_SDL;WITH_OPENAL;WITH_JACK"
StringPooling="true"
RuntimeLibrary="0"
Modified: branches/render25/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj 2010-03-11 16:11:25 UTC (rev 27415)
+++ branches/render25/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj 2010-03-11 16:40:30 UTC (rev 27416)
@@ -114,7 +114,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\ikplugin;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include;..\..\..\source\blender\render\extern\include"
+ AdditionalIncludeDirectories="..\..\..\..\build\msvc_9\intern\guardedalloc\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\makesdna;..\..\..\source\blender\makesrna;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\ikplugin;..\..\..\source\blender\windowmanager;..\..\..\source\blender\editors\include;..\..\..\source\blender\gpu;..\..\..\source\blender\render\extern\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;GAMEBLENDER=1"
MinimalRebuild="true"
RuntimeLibrary="0"
Modified: branches/render25/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj 2010-03-11 16:11:25 UTC (rev 27415)
+++ branches/render25/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj 2010-03-11 16:40:30 UTC (rev 27416)
@@ -114,7 +114,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list