[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17773] branches/projection-paint: merge from trunk - r17500 to HEAD
Campbell Barton
ideasman42 at gmail.com
Wed Dec 10 10:45:49 CET 2008
Revision: 17773
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17773
Author: campbellbarton
Date: 2008-12-10 10:45:48 +0100 (Wed, 10 Dec 2008)
Log Message:
-----------
merge from trunk - r17500 to HEAD
Modified Paths:
--------------
branches/projection-paint/extern/Makefile
branches/projection-paint/intern/SoundSystem/Makefile
branches/projection-paint/intern/elbeem/intern/utilities.h
branches/projection-paint/projectfiles_vc9/blender/blender.sln
branches/projection-paint/projectfiles_vc9/blender/nodes/nodes.vcproj
branches/projection-paint/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/projection-paint/release/Makefile
branches/projection-paint/release/scripts/bpymodules/BPyImage.py
branches/projection-paint/release/scripts/bpymodules/BPySys.py
branches/projection-paint/release/scripts/export_fbx.py
branches/projection-paint/source/Makefile
branches/projection-paint/source/blender/blenkernel/BKE_node.h
branches/projection-paint/source/blender/blenkernel/intern/node.c
branches/projection-paint/source/blender/blenlib/intern/storage.c
branches/projection-paint/source/blender/imbuf/intern/imageprocess.c
branches/projection-paint/source/blender/include/BIF_editparticle.h
branches/projection-paint/source/blender/include/BIF_outliner.h
branches/projection-paint/source/blender/include/butspace.h
branches/projection-paint/source/blender/include/transform.h
branches/projection-paint/source/blender/makesdna/DNA_scriptlink_types.h
branches/projection-paint/source/blender/nodes/TEX_node.h
branches/projection-paint/source/blender/nodes/intern/TEX_util.c
branches/projection-paint/source/blender/python/BPY_interface.c
branches/projection-paint/source/blender/python/api2_2x/Blender.c
branches/projection-paint/source/blender/python/api2_2x/Sys.c
branches/projection-paint/source/blender/python/api2_2x/doc/API_related.py
branches/projection-paint/source/blender/python/api2_2x/doc/Sys.py
branches/projection-paint/source/blender/src/SConscript
branches/projection-paint/source/blender/src/buttons_editing.c
branches/projection-paint/source/blender/src/buttons_scene.c
branches/projection-paint/source/blender/src/drawimage.c
branches/projection-paint/source/blender/src/editparticle.c
branches/projection-paint/source/blender/src/header_time.c
branches/projection-paint/source/blender/src/header_view3d.c
branches/projection-paint/source/blender/src/outliner.c
branches/projection-paint/source/blender/src/playanim.c
branches/projection-paint/source/blender/src/seqeffects.c
branches/projection-paint/source/blender/src/space.c
branches/projection-paint/source/blender/src/transform.c
branches/projection-paint/source/blender/src/transform_constraints.c
branches/projection-paint/source/blender/src/transform_generics.c
branches/projection-paint/source/creator/creator.c
branches/projection-paint/source/gameengine/BlenderRoutines/Makefile
branches/projection-paint/source/gameengine/GamePlayer/common/unix/Makefile
branches/projection-paint/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/projection-paint/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/projection-paint/source/gameengine/Ketsji/KX_Camera.cpp
branches/projection-paint/source/gameengine/Ketsji/KX_GameObject.cpp
branches/projection-paint/source/gameengine/Ketsji/KX_GameObject.h
branches/projection-paint/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/projection-paint/source/gameengine/Ketsji/KX_Scene.cpp
branches/projection-paint/source/gameengine/PyDoc/KX_GameObject.py
branches/projection-paint/source/gameengine/Rasterizer/RAS_FramingManager.h
branches/projection-paint/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/projection-paint/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/projection-paint/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/projection-paint/source/gameengine/VideoTexture/Exception.cpp
branches/projection-paint/source/gameengine/VideoTexture/Exception.h
branches/projection-paint/source/gameengine/VideoTexture/ImageRender.cpp
branches/projection-paint/source/gameengine/VideoTexture/ImageRender.h
branches/projection-paint/source/gameengine/VideoTexture/ImageViewport.cpp
branches/projection-paint/source/gameengine/VideoTexture/ImageViewport.h
branches/projection-paint/source/gameengine/VideoTexture/Texture.h
branches/projection-paint/source/gameengine/VideoTexture/blendVideoTex.cpp
branches/projection-paint/source/nan_compile.mk
branches/projection-paint/source/nan_definitions.mk
branches/projection-paint/source/nan_link.mk
Added Paths:
-----------
branches/projection-paint/config/irix6-config.py
branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
Copied: branches/projection-paint/config/irix6-config.py (from rev 17771, trunk/blender/config/irix6-config.py)
===================================================================
--- branches/projection-paint/config/irix6-config.py (rev 0)
+++ branches/projection-paint/config/irix6-config.py 2008-12-10 09:45:48 UTC (rev 17773)
@@ -0,0 +1,231 @@
+import os
+
+LCGDIR = os.getcwd()+"/../lib/irix-6.5-mips"
+LIBDIR = LCGDIR
+print LCGDIR
+
+WITH_BF_VERSE = 'false'
+BF_VERSE_INCLUDE = "#extern/verse/dist"
+
+BF_PYTHON = LCGDIR+'/python'
+BF_PYTHON_VERSION = '2.5'
+WITH_BF_STATICPYTHON = 'true'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
+BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python2.5/config/libpython${BF_PYTHON_VERSION}.a'
+
+WITH_BF_OPENAL = 'true'
+WITH_BF_STATICOPENAL = 'true'
+BF_OPENAL = LCGDIR+'/openal'
+BF_OPENAL_INC = '${BF_OPENAL}/include'
+BF_OPENAL_LIB = 'openal'
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+BF_OPENAL_LIBPATH = LIBDIR + '/lib'
+
+# some distros have a separate libalut
+# if you get linker complaints, you need to uncomment the line below
+# BF_OPENAL_LIB = 'openal alut'
+# BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a ${BF_OPENAL}/lib/libalut.a'
+
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = 'false'
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_SDL = 'true'
+BF_SDL = LCGDIR+'/SDL' #$(shell sdl-config --prefix)
+BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
+BF_SDL_LIB = 'SDL audio iconv charset' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+WITH_BF_FMOD = 'false'
+BF_FMOD = LIBDIR + '/fmod'
+
+WITH_BF_OPENEXR = 'false'
+WITH_BF_STATICOPENEXR = 'false'
+BF_OPENEXR = '/usr'
+# when compiling with your own openexr lib you might need to set...
+# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
+
+BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+
+
+WITH_BF_DDS = 'false'
+
+WITH_BF_JPEG = 'false'
+BF_JPEG = LCGDIR+'/jpeg'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'jpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = 'false'
+BF_PNG = LCGDIR+"/png"
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'png'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+BF_TIFF = '/usr/nekoware'
+BF_TIFF_INC = '${BF_TIFF}/include'
+
+WITH_BF_ZLIB = 'true'
+BF_ZLIB = LCGDIR+"/zlib"
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'z'
+BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
+
+WITH_BF_INTERNATIONAL = 'true'
+
+BF_GETTEXT = LCGDIR+'/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gettextpo intl'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_FTGL = 'true'
+BF_FTGL = '#extern/bFTGL'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
+
+WITH_BF_GAMEENGINE='false'
+
+WITH_BF_ODE = 'false'
+BF_ODE = LIBDIR + '/ode'
+BF_ODE_INC = BF_ODE + '/include'
+BF_ODE_LIB = BF_ODE + '/lib/libode.a'
+
+WITH_BF_BULLET = 'true'
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_SOLID = '#extern/solid'
+BF_SOLID_INC = '${BF_SOLID}'
+BF_SOLID_LIB = 'extern_solid'
+
+WITH_BF_YAFRAY = 'true'
+
+#WITH_BF_NSPR = 'true'
+#BF_NSPR = $(LIBDIR)/nspr
+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
+#BF_NSPR_LIB =
+
+# Uncomment the following line to use Mozilla inplace of netscape
+#CPPFLAGS += -DMOZ_NOT_NET
+# Location of MOZILLA/Netscape header files...
+#BF_MOZILLA = $(LIBDIR)/mozilla
+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
+#BF_MOZILLA_LIB =
+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
+# if this is not set.
+#
+# Be paranoid regarding library creation (do not update archives)
+#BF_PARANOID = 'true'
+
+# enable freetype2 support for text objects
+BF_FREETYPE = LCGDIR+'/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
+BF_QUICKTIME = '/usr/local'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
+
+WITH_BF_ICONV = 'true'
+BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv charset'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+WITH_BF_BINRELOC = 'false'
+
+# enable ffmpeg support
+WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
+# Uncomment the following two lines to use system's ffmpeg
+BF_FFMPEG = LCGDIR+'/ffmpeg'
+BF_FFMPEG_LIB = 'avformat avcodec swscale avutil faad faac vorbis x264 ogg mp3lame z'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+
+# enable ogg, vorbis and theora in ffmpeg
+WITH_BF_OGG = 'false' # -DWITH_OGG
+BF_OGG = '/usr'
+BF_OGG_INC = '${BF_OGG}/include'
+BF_OGG_LIB = 'ogg vorbis theoraenc theoradec'
+
+WITH_BF_OPENJPEG = 'false'
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_REDCODE = 'false'
+BF_REDCODE = '#extern/libredcode'
+BF_REDCODE_LIB = ''
+BF_REDCODE_INC = '${BF_REDCODE}/include'
+BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
+
+# Mesa Libs should go here if your using them as well....
+WITH_BF_STATICOPENGL = 'false'
+BF_OPENGL = '/usr'
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIB = 'GL GLU X11 Xi Xext'
+BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a'
+
+
+CC = 'c99'
+CXX = 'CC'
+
+
+CCFLAGS = ['-pipe','-fPIC', '-n32']
+
+CPPFLAGS = ['-DXP_UNIX']
+CXXFLAGS = ['-pipe','-fPIC', '-n32']
+REL_CFLAGS = ['-O2']
+REL_CCFLAGS = ['-O2']
+##BF_DEPEND = 'true'
+##
+##AR = ar
+##ARFLAGS = ruv
+##ARFLAGSQUIET = ru
+##
+C_WARN = '-no_prelink -ptused'
+
+CC_WARN = '-no_prelink -ptused'
+
+##FIX_STUBS_WARNINGS = -Wno-unused
+
+LLIBS = 'c m dl pthread dmedia movie'
+##LOPTS = --dynamic
+##DYNLDFLAGS = -shared $(LDFLAGS)
+
+BF_PROFILE_FLAGS = ['-pg','-g']
+BF_PROFILE = 'false'
+
+BF_DEBUG = 'false'
+BF_DEBUG_FLAGS = '-g'
+
+BF_BUILDDIR = '../build/irix6'
+BF_INSTALLDIR='../install/irix6'
+BF_DOCDIR='../install/doc'
+
+#Link against pthread
+LDIRS = []
+LDIRS.append(BF_FREETYPE_LIBPATH)
+LDIRS.append(BF_PNG_LIBPATH)
+LDIRS.append(BF_ZLIB_LIBPATH)
+LDIRS.append(BF_SDL_LIBPATH)
+LDIRS.append(BF_OPENAL_LIBPATH)
+LDIRS.append(BF_ICONV_LIBPATH)
+
+PLATFORM_LINKFLAGS = []
+for x in LDIRS:
+ PLATFORM_LINKFLAGS.append("-L"+x)
+
+PLATFORM_LINKFLAGS += ['-L${LCGDIR}/jpeg/lib' , '-L/usr/lib32', '-n32', '-v', '-no_prelink']
+print PLATFORM_LINKFLAGS
+LINKFLAGS= PLATFORM_LINKFLAGS
Modified: branches/projection-paint/extern/Makefile
===================================================================
--- branches/projection-paint/extern/Makefile 2008-12-10 09:07:15 UTC (rev 17772)
+++ branches/projection-paint/extern/Makefile 2008-12-10 09:45:48 UTC (rev 17773)
@@ -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/projection-paint/intern/SoundSystem/Makefile
===================================================================
--- branches/projection-paint/intern/SoundSystem/Makefile 2008-12-10 09:07:15 UTC (rev 17772)
+++ branches/projection-paint/intern/SoundSystem/Makefile 2008-12-10 09:45:48 UTC (rev 17773)
@@ -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/projection-paint/intern/elbeem/intern/utilities.h
===================================================================
--- branches/projection-paint/intern/elbeem/intern/utilities.h 2008-12-10 09:07:15 UTC (rev 17772)
+++ branches/projection-paint/intern/elbeem/intern/utilities.h 2008-12-10 09:45:48 UTC (rev 17773)
@@ -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/projection-paint/projectfiles_vc9/blender/blender.sln
===================================================================
--- branches/projection-paint/projectfiles_vc9/blender/blender.sln 2008-12-10 09:07:15 UTC (rev 17772)
+++ branches/projection-paint/projectfiles_vc9/blender/blender.sln 2008-12-10 09:45:48 UTC (rev 17773)
@@ -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}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list