[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17841] branches/soc-2008-unclezeiv: svn merge -r 17532:17830 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Davide Vercelli davide.vercelli at gmail.com
Sun Dec 14 12:59:27 CET 2008 

Revision: 17841
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17841
Author:   unclezeiv
Date:     2008-12-14 12:59:24 +0100 (Sun, 14 Dec 2008)

Log Message:
-----------
svn merge -r 17532:17830 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/soc-2008-unclezeiv/extern/Makefile
    branches/soc-2008-unclezeiv/intern/SoundSystem/Makefile
    branches/soc-2008-unclezeiv/intern/elbeem/intern/utilities.h
    branches/soc-2008-unclezeiv/projectfiles_vc9/blender/blender.sln
    branches/soc-2008-unclezeiv/projectfiles_vc9/blender/nodes/nodes.vcproj
    branches/soc-2008-unclezeiv/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/soc-2008-unclezeiv/release/Makefile
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/BPyImage.py
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/BPyMathutils.py
    branches/soc-2008-unclezeiv/release/scripts/bpymodules/BPySys.py
    branches/soc-2008-unclezeiv/release/scripts/export_fbx.py
    branches/soc-2008-unclezeiv/release/scripts/import_web3d.py
    branches/soc-2008-unclezeiv/source/Makefile
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_brush.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_node.h
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/curve.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/customdata.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/node.c
    branches/soc-2008-unclezeiv/source/blender/blenlib/intern/storage.c
    branches/soc-2008-unclezeiv/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-unclezeiv/source/blender/include/BIF_editparticle.h
    branches/soc-2008-unclezeiv/source/blender/include/BIF_outliner.h
    branches/soc-2008-unclezeiv/source/blender/include/BSE_view.h
    branches/soc-2008-unclezeiv/source/blender/include/butspace.h
    branches/soc-2008-unclezeiv/source/blender/include/transform.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_scriptlink_types.h
    branches/soc-2008-unclezeiv/source/blender/nodes/TEX_node.h
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_util.c
    branches/soc-2008-unclezeiv/source/blender/python/BPY_interface.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Blender.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Sys.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/API_related.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Sys.py
    branches/soc-2008-unclezeiv/source/blender/src/SConscript
    branches/soc-2008-unclezeiv/source/blender/src/buttons_editing.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_scene.c
    branches/soc-2008-unclezeiv/source/blender/src/drawimage.c
    branches/soc-2008-unclezeiv/source/blender/src/drawview.c
    branches/soc-2008-unclezeiv/source/blender/src/editparticle.c
    branches/soc-2008-unclezeiv/source/blender/src/header_time.c
    branches/soc-2008-unclezeiv/source/blender/src/header_view3d.c
    branches/soc-2008-unclezeiv/source/blender/src/imagepaint.c
    branches/soc-2008-unclezeiv/source/blender/src/outliner.c
    branches/soc-2008-unclezeiv/source/blender/src/playanim.c
    branches/soc-2008-unclezeiv/source/blender/src/space.c
    branches/soc-2008-unclezeiv/source/blender/src/transform.c
    branches/soc-2008-unclezeiv/source/blender/src/transform_constraints.c
    branches/soc-2008-unclezeiv/source/blender/src/transform_generics.c
    branches/soc-2008-unclezeiv/source/blender/src/view.c
    branches/soc-2008-unclezeiv/source/creator/creator.c
    branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/GamePlayer/common/unix/Makefile
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_GameObject.py
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2008-unclezeiv/source/gameengine/VideoTexture/Exception.cpp
    branches/soc-2008-unclezeiv/source/gameengine/VideoTexture/Exception.h
    branches/soc-2008-unclezeiv/source/gameengine/VideoTexture/ImageRender.cpp
    branches/soc-2008-unclezeiv/source/gameengine/VideoTexture/ImageRender.h
    branches/soc-2008-unclezeiv/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/soc-2008-unclezeiv/source/gameengine/VideoTexture/ImageViewport.h
    branches/soc-2008-unclezeiv/source/gameengine/VideoTexture/Texture.h
    branches/soc-2008-unclezeiv/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/soc-2008-unclezeiv/source/nan_compile.mk
    branches/soc-2008-unclezeiv/source/nan_definitions.mk
    branches/soc-2008-unclezeiv/source/nan_link.mk
    branches/soc-2008-unclezeiv/tools/btools.py

Added Paths:
-----------
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
    branches/soc-2008-unclezeiv/source/blender/nodes/intern/TEX_nodes/TEX_distance.c

Modified: branches/soc-2008-unclezeiv/extern/Makefile
===================================================================
--- branches/soc-2008-unclezeiv/extern/Makefile	2008-12-14 11:55:49 UTC (rev 17840)
+++ branches/soc-2008-unclezeiv/extern/Makefile	2008-12-14 11:59:24 UTC (rev 17841)
@@ -57,10 +57,7 @@
     DIRS += binreloc
 endif
 
-TARGET =
-ifneq ($(OS),irix)
-  TARGET=solid
-endif
+TARGET = solid
 
 all::
 	@[ -d $(OCGDIR)/extern ] || mkdir -p $(OCGDIR)/extern

Modified: branches/soc-2008-unclezeiv/intern/SoundSystem/Makefile
===================================================================
--- branches/soc-2008-unclezeiv/intern/SoundSystem/Makefile	2008-12-14 11:55:49 UTC (rev 17840)
+++ branches/soc-2008-unclezeiv/intern/SoundSystem/Makefile	2008-12-14 11:59:24 UTC (rev 17841)
@@ -47,6 +47,9 @@
   ifeq ($(OS),$(findstring $(OS), "linux freebsd solaris"))
     DIRS += openal sdl
   endif
+  ifeq ($(OS), irix)
+    DIRS += sdl
+  endif
 else
   export CPPFLAGS += -DNO_SOUND
 endif

Modified: branches/soc-2008-unclezeiv/intern/elbeem/intern/utilities.h
===================================================================
--- branches/soc-2008-unclezeiv/intern/elbeem/intern/utilities.h	2008-12-14 11:55:49 UTC (rev 17840)
+++ branches/soc-2008-unclezeiv/intern/elbeem/intern/utilities.h	2008-12-14 11:59:24 UTC (rev 17841)
@@ -154,12 +154,18 @@
  */
 
 /* minimum */
+#ifdef MIN
+#undef MIN
+#endif
 template < class T >
 inline T
 MIN( T a, T b )
 { return (a < b) ? a : b ; }
 
 /* maximum */
+#ifdef MAX
+#undef MAX
+#endif
 template < class T >
 inline T
 MAX( T a, T b )

Modified: branches/soc-2008-unclezeiv/projectfiles_vc9/blender/blender.sln
===================================================================
--- branches/soc-2008-unclezeiv/projectfiles_vc9/blender/blender.sln	2008-12-14 11:55:49 UTC (rev 17840)
+++ branches/soc-2008-unclezeiv/projectfiles_vc9/blender/blender.sln	2008-12-14 11:59:24 UTC (rev 17841)
@@ -151,6 +151,7 @@
 		{415BFD6E-64CF-422B-AF88-C07F040A7292} = {415BFD6E-64CF-422B-AF88-C07F040A7292}
 		{670EC17A-0548-4BBF-A27B-636C7C188139} = {670EC17A-0548-4BBF-A27B-636C7C188139}
 		{4C3AB78A-52CA-4276-A041-39776E52D8C8} = {4C3AB78A-52CA-4276-A041-39776E52D8C8}
+		{E784098D-3ED8-433A-9353-9679415DDDC5} = {E784098D-3ED8-433A-9353-9679415DDDC5}
 		{6B801390-5F95-4F07-81A7-97FBA046AACC} = {6B801390-5F95-4F07-81A7-97FBA046AACC}
 		{CAE37E91-6570-43AC-A4B4-7A37A4B0FC94} = {CAE37E91-6570-43AC-A4B4-7A37A4B0FC94}
 		{76D90B92-ECC7-409C-9F98-A8814B90F3C0} = {76D90B92-ECC7-409C-9F98-A8814B90F3C0}
@@ -167,13 +168,16 @@
 		{E90C7BC2-CF30-4A60-A8F2-0050D592E358} = {E90C7BC2-CF30-4A60-A8F2-0050D592E358}
 		{8B8D4FC3-3234-4E54-8376-5AB83D00D164} = {8B8D4FC3-3234-4E54-8376-5AB83D00D164}
 		{4B6AFCC5-968C-424A-8F20-76E41B3BEF74} = {4B6AFCC5-968C-424A-8F20-76E41B3BEF74}
+		{0112CAD5-3584-412A-A2E5-1315A00437B4} = {0112CAD5-3584-412A-A2E5-1315A00437B4}
 		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA} = {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}
 		{E86B7BDE-C33C-4E55-9433-E74C141D7538} = {E86B7BDE-C33C-4E55-9433-E74C141D7538}
 		{32CC75E2-EE85-45E6-8E3D-513F58464F43} = {32CC75E2-EE85-45E6-8E3D-513F58464F43}
 		{9A307EE5-CD77-47BC-BD87-62508C7E19D8} = {9A307EE5-CD77-47BC-BD87-62508C7E19D8}
 		{AB590CED-F71F-4A17-A89B-18583ECD633D} = {AB590CED-F71F-4A17-A89B-18583ECD633D}
+		{B83C6BED-11EC-46C8-AFFA-121EEDE94373} = {B83C6BED-11EC-46C8-AFFA-121EEDE94373}
 		{1CC733F1-6AB5-4904-8F63-C08C46B79DD9} = {1CC733F1-6AB5-4904-8F63-C08C46B79DD9}
 		{B789C2F3-279E-4A85-8F0A-7F7AC068E598} = {B789C2F3-279E-4A85-8F0A-7F7AC068E598}
+		{524264F4-DF21-4B79-847F-E7CA643ECD0B} = {524264F4-DF21-4B79-847F-E7CA643ECD0B}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KX_blenderhook", "..\gameengine\blenderhook\KX_blenderhook.vcproj", "{8154A59A-CAED-403D-AB94-BC4E7C032666}"
@@ -621,19 +625,25 @@
 		{0112CAD5-3584-412A-A2E5-1315A00437B4}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
 		{0112CAD5-3584-412A-A2E5-1315A00437B4}.Blender Release|Win32.Build.0 = Blender Release|Win32
 		{0112CAD5-3584-412A-A2E5-1315A00437B4}.BlenderPlayer Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{0112CAD5-3584-412A-A2E5-1315A00437B4}.BlenderPlayer Debug|Win32.Build.0 = Blender Debug|Win32
 		{0112CAD5-3584-412A-A2E5-1315A00437B4}.BlenderPlayer Release|Win32.ActiveCfg = Blender Release|Win32
+		{0112CAD5-3584-412A-A2E5-1315A00437B4}.BlenderPlayer Release|Win32.Build.0 = Blender Release|Win32
 		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
 		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
 		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
 		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.Blender Release|Win32.Build.0 = Blender Release|Win32
 		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.BlenderPlayer Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.BlenderPlayer Debug|Win32.Build.0 = Blender Debug|Win32
 		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.BlenderPlayer Release|Win32.ActiveCfg = Blender Release|Win32
+		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.BlenderPlayer Release|Win32.Build.0 = Blender Release|Win32
 		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
 		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
 		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
 		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.Blender Release|Win32.Build.0 = Blender Release|Win32
 		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.BlenderPlayer Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.BlenderPlayer Debug|Win32.Build.0 = Blender Debug|Win32
 		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.BlenderPlayer Release|Win32.ActiveCfg = Blender Release|Win32
+		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.BlenderPlayer Release|Win32.Build.0 = Blender Release|Win32
 		{D696C86B-0B53-4471-A50D-5B983A6FA4AD}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
 		{D696C86B-0B53-4471-A50D-5B983A6FA4AD}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
 		{D696C86B-0B53-4471-A50D-5B983A6FA4AD}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
@@ -669,6 +679,7 @@
 		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
 		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.Blender Release|Win32.Build.0 = Blender Release|Win32
 		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.BlenderPlayer Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.BlenderPlayer Debug|Win32.Build.0 = Blender Debug|Win32
 		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.BlenderPlayer Release|Win32.ActiveCfg = Blender Release|Win32
 		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.BlenderPlayer Release|Win32.Build.0 = Blender Release|Win32
 		{531D4862-D0E7-4B9B-A0B6-B3A6A25B547A}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
@@ -694,7 +705,9 @@
 		{E784098D-3ED8-433A-9353-9679415DDDC5}.Blender Release|Win32.ActiveCfg = Blender Release|Win32
 		{E784098D-3ED8-433A-9353-9679415DDDC5}.Blender Release|Win32.Build.0 = Blender Release|Win32
 		{E784098D-3ED8-433A-9353-9679415DDDC5}.BlenderPlayer Debug|Win32.ActiveCfg = Blender Debug|Win32
+		{E784098D-3ED8-433A-9353-9679415DDDC5}.BlenderPlayer Debug|Win32.Build.0 = Blender Debug|Win32
 		{E784098D-3ED8-433A-9353-9679415DDDC5}.BlenderPlayer Release|Win32.ActiveCfg = Blender Release|Win32
+		{E784098D-3ED8-433A-9353-9679415DDDC5}.BlenderPlayer Release|Win32.Build.0 = Blender Release|Win32
 		{EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32
 		{EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}.Blender Debug|Win32.Build.0 = Blender Debug|Win32
 		{EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}.Blender Release|Win32.ActiveCfg = Blender Release|Win32

Modified: branches/soc-2008-unclezeiv/projectfiles_vc9/blender/nodes/nodes.vcproj
===================================================================
--- branches/soc-2008-unclezeiv/projectfiles_vc9/blender/nodes/nodes.vcproj	2008-12-14 11:55:49 UTC (rev 17840)
+++ branches/soc-2008-unclezeiv/projectfiles_vc9/blender/nodes/nodes.vcproj	2008-12-14 11:59:24 UTC (rev 17841)
@@ -616,10 +616,18 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_coord.c"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_curves.c"
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_distance.c"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_hueSatVal.c"
 					>
 				</File>

Modified: branches/soc-2008-unclezeiv/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
===================================================================
--- branches/soc-2008-unclezeiv/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj	2008-12-14 11:55:49 UTC (rev 17840)
+++ branches/soc-2008-unclezeiv/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj	2008-12-14 11:59:24 UTC (rev 17841)
@@ -72,12 +72,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386&#x0D;&#x0A;"
-				AdditionalDependencies="odelib.lib fmodvc.lib libbmfont.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib qtmlClient.lib SDL.lib freetype2ST.lib python25_d.lib pthreadVSE2.lib pthreadVC2.lib Half.lib Iex.lib IlmImf.lib IlmThread.lib Imath.lib avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib"
+				AdditionalDependencies="odelib.lib fmodvc.lib ws2_32.lib vfw32.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib openal_static.lib libjpeg.lib dxguid.lib libeay32.lib libpng.lib libz.lib qtmlClient.lib SDL.lib freetype2ST.lib python25_d.lib pthreadVSE2.lib pthreadVC2.lib Half.lib Iex.lib IlmImf.lib IlmThread.lib Imath.lib avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib"
 				ShowProgress="0"
 				OutputFile="..\..\..\..\bin\debug\blenderplayer.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list