Revision: 17335 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17335 Author: campbellbarton Date: 2008-11-05 16:11:40 +0100 (Wed, 05 Nov 2008)
Log Message: ----------- svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17279:HEAD somehow scripts line endings change is messing things up, these changes wont be included error is: svn: File 'release/scripts/scripttemplate_metaball_create.py' has inconsistent newlines svn: Inconsistent line ending style svn: Error reading spooled REPORT request response Modified Paths: -------------- branches/projection-paint/CMakeLists.txt branches/projection-paint/config/darwin-config.py branches/projection-paint/config/linux2-config.py branches/projection-paint/config/linuxcross-config.py branches/projection-paint/config/openbsd3-config.py branches/projection-paint/config/sunos5-config.py branches/projection-paint/config/win32-mingw-config.py branches/projection-paint/config/win32-vc-config.py branches/projection-paint/extern/libopenjpeg/SConscript branches/projection-paint/extern/libredcode/SConscript branches/projection-paint/extern/libredcode/format.c branches/projection-paint/source/Makefile branches/projection-paint/source/blender/blenkernel/BKE_lattice.h branches/projection-paint/source/blender/blenkernel/BKE_shrinkwrap.h branches/projection-paint/source/blender/blenkernel/intern/blender.c branches/projection-paint/source/blender/blenkernel/intern/curve.c branches/projection-paint/source/blender/blenkernel/intern/deform.c branches/projection-paint/source/blender/blenkernel/intern/exotic.c branches/projection-paint/source/blender/blenkernel/intern/lattice.c branches/projection-paint/source/blender/blenkernel/intern/modifier.c branches/projection-paint/source/blender/blenkernel/intern/object.c branches/projection-paint/source/blender/blenkernel/intern/shrinkwrap.c branches/projection-paint/source/blender/blenkernel/intern/simple_deform.c branches/projection-paint/source/blender/blenkernel/intern/texture.c branches/projection-paint/source/blender/blenloader/intern/readblenentry.c branches/projection-paint/source/blender/blenloader/intern/readfile.c branches/projection-paint/source/blender/blenloader/intern/readfile.h branches/projection-paint/source/blender/imbuf/intern/IMB_anim.h branches/projection-paint/source/blender/imbuf/intern/amiga.c branches/projection-paint/source/blender/imbuf/intern/anim.c branches/projection-paint/source/blender/imbuf/intern/readimage.c branches/projection-paint/source/blender/imbuf/intern/util.c branches/projection-paint/source/blender/python/api2_2x/Armature.c branches/projection-paint/source/blender/src/buttons_logic.c branches/projection-paint/source/blender/src/buttons_shading.c branches/projection-paint/source/blender/src/editmesh_mods.c branches/projection-paint/source/blender/src/interface.c branches/projection-paint/source/blender/src/reeb.c branches/projection-paint/source/creator/CMakeLists.txt branches/projection-paint/source/gameengine/Ketsji/KX_BlenderMaterial.h branches/projection-paint/source/gameengine/Makefile branches/projection-paint/source/gameengine/VideoTexture/BlendType.h branches/projection-paint/source/gameengine/VideoTexture/CMakeLists.txt branches/projection-paint/source/gameengine/VideoTexture/Common.h branches/projection-paint/source/gameengine/VideoTexture/Exception.cpp branches/projection-paint/source/gameengine/VideoTexture/Exception.h branches/projection-paint/source/gameengine/VideoTexture/FilterBase.cpp branches/projection-paint/source/gameengine/VideoTexture/FilterBase.h branches/projection-paint/source/gameengine/VideoTexture/FilterBlueScreen.cpp branches/projection-paint/source/gameengine/VideoTexture/FilterBlueScreen.h branches/projection-paint/source/gameengine/VideoTexture/FilterColor.cpp branches/projection-paint/source/gameengine/VideoTexture/FilterColor.h branches/projection-paint/source/gameengine/VideoTexture/FilterNormal.cpp branches/projection-paint/source/gameengine/VideoTexture/FilterNormal.h branches/projection-paint/source/gameengine/VideoTexture/FilterSource.cpp branches/projection-paint/source/gameengine/VideoTexture/FilterSource.h branches/projection-paint/source/gameengine/VideoTexture/ImageBase.cpp branches/projection-paint/source/gameengine/VideoTexture/ImageBase.h branches/projection-paint/source/gameengine/VideoTexture/ImageBuff.cpp branches/projection-paint/source/gameengine/VideoTexture/ImageBuff.h branches/projection-paint/source/gameengine/VideoTexture/ImageMix.cpp branches/projection-paint/source/gameengine/VideoTexture/ImageMix.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/Makefile branches/projection-paint/source/gameengine/VideoTexture/PyTypeList.cpp branches/projection-paint/source/gameengine/VideoTexture/PyTypeList.h branches/projection-paint/source/gameengine/VideoTexture/SConscript branches/projection-paint/source/gameengine/VideoTexture/Texture.cpp branches/projection-paint/source/gameengine/VideoTexture/Texture.h branches/projection-paint/source/gameengine/VideoTexture/VideoBase.cpp branches/projection-paint/source/gameengine/VideoTexture/VideoBase.h branches/projection-paint/source/gameengine/VideoTexture/VideoFFmpeg.cpp branches/projection-paint/source/gameengine/VideoTexture/VideoFFmpeg.h branches/projection-paint/source/gameengine/VideoTexture/blendVideoTex.cpp branches/projection-paint/source/nan_compile.mk branches/projection-paint/tools/Blender.py Property Changed: ---------------- branches/projection-paint/source/gameengine/VideoTexture/BlendType.h branches/projection-paint/source/gameengine/VideoTexture/CMakeLists.txt branches/projection-paint/source/gameengine/VideoTexture/Common.h branches/projection-paint/source/gameengine/VideoTexture/Exception.cpp branches/projection-paint/source/gameengine/VideoTexture/Exception.h branches/projection-paint/source/gameengine/VideoTexture/FilterBase.cpp branches/projection-paint/source/gameengine/VideoTexture/FilterBase.h branches/projection-paint/source/gameengine/VideoTexture/FilterBlueScreen.cpp branches/projection-paint/source/gameengine/VideoTexture/FilterBlueScreen.h branches/projection-paint/source/gameengine/VideoTexture/FilterColor.cpp branches/projection-paint/source/gameengine/VideoTexture/FilterColor.h branches/projection-paint/source/gameengine/VideoTexture/FilterNormal.cpp branches/projection-paint/source/gameengine/VideoTexture/FilterNormal.h branches/projection-paint/source/gameengine/VideoTexture/FilterSource.cpp branches/projection-paint/source/gameengine/VideoTexture/FilterSource.h branches/projection-paint/source/gameengine/VideoTexture/ImageBase.cpp branches/projection-paint/source/gameengine/VideoTexture/ImageBase.h branches/projection-paint/source/gameengine/VideoTexture/ImageBuff.cpp branches/projection-paint/source/gameengine/VideoTexture/ImageBuff.h branches/projection-paint/source/gameengine/VideoTexture/ImageMix.cpp branches/projection-paint/source/gameengine/VideoTexture/ImageMix.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/Makefile branches/projection-paint/source/gameengine/VideoTexture/PyTypeList.cpp branches/projection-paint/source/gameengine/VideoTexture/PyTypeList.h branches/projection-paint/source/gameengine/VideoTexture/SConscript branches/projection-paint/source/gameengine/VideoTexture/Texture.cpp branches/projection-paint/source/gameengine/VideoTexture/Texture.h branches/projection-paint/source/gameengine/VideoTexture/VideoBase.cpp branches/projection-paint/source/gameengine/VideoTexture/VideoBase.h branches/projection-paint/source/gameengine/VideoTexture/VideoFFmpeg.cpp branches/projection-paint/source/gameengine/VideoTexture/VideoFFmpeg.h branches/projection-paint/source/gameengine/VideoTexture/blendVideoTex.cpp Modified: branches/projection-paint/CMakeLists.txt =================================================================== --- branches/projection-paint/CMakeLists.txt 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/CMakeLists.txt 2008-11-05 15:11:40 UTC (rev 17335) @@ -88,14 +88,16 @@ #Platform specifics IF(UNIX) - INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake) - IF(OPENAL_FOUND) - SET(WITH_OPENAL ON) - SET(OPENAL_LIB ${OPENAL_LIBRARY}) - SET(OPENAL_INC ${OPENAL_INCLUDE_DIR}) - ELSE(OPENAL_FOUND) - SET(WITH_OPENAL OFF) - ENDIF(OPENAL_FOUND) + IF(WITH_OPENAL) + INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake) + IF(OPENAL_FOUND) + SET(WITH_OPENAL ON) + SET(OPENAL_LIB ${OPENAL_LIBRARY}) + SET(OPENAL_INC ${OPENAL_INCLUDE_DIR}) + ELSE(OPENAL_FOUND) + SET(WITH_OPENAL OFF) + ENDIF(OPENAL_FOUND) + ENDIF(WITH_OPENAL) FIND_LIBRARY(ALUT_LIBRARY NAMES alut Modified: branches/projection-paint/config/darwin-config.py =================================================================== --- branches/projection-paint/config/darwin-config.py 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/config/darwin-config.py 2008-11-05 15:11:40 UTC (rev 17335) @@ -260,11 +260,11 @@ ##LOPTS = --dynamic ##DYNLDFLAGS = -shared $(LDFLAGS) -BF_PROFILE_FLAGS = ' -pg -g ' +BF_PROFILE_FLAGS = ['-pg', '-g '] BF_PROFILE = False BF_DEBUG = False -BF_DEBUG_FLAGS = '-g' +BF_DEBUG_FLAGS = ['-g'] BF_BUILDDIR='../build/darwin' BF_INSTALLDIR='../install/darwin' Modified: branches/projection-paint/config/linux2-config.py =================================================================== --- branches/projection-paint/config/linux2-config.py 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/config/linux2-config.py 2008-11-05 15:11:40 UTC (rev 17335) @@ -201,7 +201,7 @@ BF_PROFILE = False BF_DEBUG = False -BF_DEBUG_FLAGS = '-g' +BF_DEBUG_FLAGS = ['-g'] BF_BUILDDIR = '../build/linux2' BF_INSTALLDIR='../install/linux2' Modified: branches/projection-paint/config/linuxcross-config.py =================================================================== --- branches/projection-paint/config/linuxcross-config.py 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/config/linuxcross-config.py 2008-11-05 15:11:40 UTC (rev 17335) @@ -144,7 +144,7 @@ LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ] BF_DEBUG = False -BF_DEBUG_FLAGS= '' +BF_DEBUG_FLAGS= [] BF_BUILDDIR = '../build/linuxcross' BF_INSTALLDIR='../install/linuxcross' Modified: branches/projection-paint/config/openbsd3-config.py =================================================================== --- branches/projection-paint/config/openbsd3-config.py 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/config/openbsd3-config.py 2008-11-05 15:11:40 UTC (rev 17335) @@ -155,11 +155,11 @@ ##LOPTS = --dynamic ##DYNLDFLAGS = -shared $(LDFLAGS) -BF_PROFILE_FLAGS = ' -pg -g ' +BF_PROFILE_FLAGS = ['-pg', '-g'] BF_PROFILE = False BF_DEBUG = False -BF_DEBUG_FLAGS = '-g' +BF_DEBUG_FLAGS = ['-g'] BF_BUILDDIR='../build/openbsd3' BF_INSTALLDIR='../install/openbsd3' Modified: branches/projection-paint/config/sunos5-config.py =================================================================== --- branches/projection-paint/config/sunos5-config.py 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/config/sunos5-config.py 2008-11-05 15:11:40 UTC (rev 17335) @@ -173,11 +173,11 @@ BF_PROFILE = False BF_DEBUG = False -BF_DEBUG_FLAGS = '' +BF_DEBUG_FLAGS = [] BF_BUILDDIR = '../build/sunos5' BF_INSTALLDIR='../install/sunos5' BF_DOCDIR='../install/doc' -PLATFORM_LINKFLAGS = [''] +PLATFORM_LINKFLAGS = [] Modified: branches/projection-paint/config/win32-mingw-config.py =================================================================== --- branches/projection-paint/config/win32-mingw-config.py 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/config/win32-mingw-config.py 2008-11-05 15:11:40 UTC (rev 17335) @@ -160,7 +160,7 @@ LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++'] BF_DEBUG = False -BF_DEBUG_FLAGS= '-g' +BF_DEBUG_FLAGS= ['-g'] BF_PROFILE_FLAGS = ['-pg','-g'] BF_PROFILE = False Modified: branches/projection-paint/config/win32-vc-config.py =================================================================== --- branches/projection-paint/config/win32-vc-config.py 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/config/win32-vc-config.py 2008-11-05 15:11:40 UTC (rev 17335) @@ -150,6 +150,11 @@ BF_QUICKTIME_LIB = 'qtmlClient' BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries' +WITH_BF_OPENJPEG = True + +WITH_BF_REDCODE = False +BF_REDCODE_INC = '#extern' + WITH_BF_STATICOPENGL = False BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIBINC = '${BF_OPENGL}/lib' Modified: branches/projection-paint/extern/libopenjpeg/SConscript =================================================================== --- branches/projection-paint/extern/libopenjpeg/SConscript 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/extern/libopenjpeg/SConscript 2008-11-05 15:11:40 UTC (rev 17335) @@ -7,14 +7,18 @@ sources = env.Glob('*.c') incs = '.' -flags = "-Wall -O3 -ffast-math -std=c99" +if env['OURPLATFORM'] == 'win32-vc': + flags = [] +else: + flags = ['-Wall', '-O3', '-ffast-math', '-std=c99'] -oj_env = env.Copy(); -oj_env.Replace(CCFLAGS = '') -oj_env.Replace(BF_DEBUG_FLAGS = '') +oj_env = env.Clone() +if not env['OURPLATFORM'] == 'win32-vc': + oj_env.Replace(CCFLAGS = '') + oj_env.Replace(BF_DEBUG_FLAGS = '') oj_env.BlenderLib ( libname='extern_openjpeg', sources=sources, includes=Split(incs), defines=[], libtype=['core','intern','player'], - priority=[10, 10, 300], compileflags = Split(flags)) + priority=[10, 10, 300], compileflags = flags) Modified: branches/projection-paint/extern/libredcode/SConscript =================================================================== --- branches/projection-paint/extern/libredcode/SConscript 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/extern/libredcode/SConscript 2008-11-05 15:11:40 UTC (rev 17335) @@ -9,18 +9,6 @@ sources = env.Glob('*.c') incs = '. ../libopenjpeg' -root = "extern/libredcode" - -if not os.path.isdir(root + "/include"): - os.mkdir(root + "/include"); -if not os.path.isdir(root + "/include/redcode"): - os.mkdir(root + "/include/redcode"); - -for h in env.Glob('*.h'): - shutil.copyfile(root + "/" + h, - root + "/include/redcode/" + h) - - env.BlenderLib ( libname='extern_redcode', sources=sources, includes=Split(incs), defines=[], Modified: branches/projection-paint/extern/libredcode/format.c =================================================================== --- branches/projection-paint/extern/libredcode/format.c 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/extern/libredcode/format.c 2008-11-05 15:11:40 UTC (rev 17335) @@ -1,4 +1,9 @@ +#ifdef _WIN32 +#include <Winsock2.h> +#else #include <netinet/in.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: branches/projection-paint/source/Makefile =================================================================== --- branches/projection-paint/source/Makefile 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/source/Makefile 2008-11-05 15:11:40 UTC (rev 17335) @@ -142,6 +142,7 @@ COMLIB += $(OCGDIR)/gameengine/OpenGLrasterizer/$(DEBUG_DIR)libOpenGLrasterizer.a COMLIB += $(OCGDIR)/gameengine/expression/$(DEBUG_DIR)libexpression.a COMLIB += $(OCGDIR)/gameengine/scenegraph/$(DEBUG_DIR)libscenegraph.a + COMLIB += $(OCGDIR)/gameengine/videotex/$(DEBUG_DIR)libvideotex.a # COMLIB += $(OCGDIR)/sumo/$(DEBUG_DIR)libfuzzics.a # COMLIB += $(OCGDIR)/sumo/$(DEBUG_DIR)libsolid.a COMLIB += $(NAN_MOTO)/lib/libmoto.a Modified: branches/projection-paint/source/blender/blenkernel/BKE_lattice.h =================================================================== --- branches/projection-paint/source/blender/blenkernel/BKE_lattice.h 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/source/blender/blenkernel/BKE_lattice.h 2008-11-05 15:11:40 UTC (rev 17335) @@ -35,6 +35,7 @@ struct Object; struct DerivedMesh; struct BPoint; +struct MDeformVert; extern struct Lattice *editLatt; @@ -67,5 +68,7 @@ void lattice_applyVertexCos(struct Object *ob, float (*vertexCos)[3]); void lattice_calc_modifiers(struct Object *ob); +struct MDeformVert* lattice_get_deform_verts(struct Object *lattice); + #endif Modified: branches/projection-paint/source/blender/blenkernel/BKE_shrinkwrap.h =================================================================== --- branches/projection-paint/source/blender/blenkernel/BKE_shrinkwrap.h 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/source/blender/blenkernel/BKE_shrinkwrap.h 2008-11-05 15:11:40 UTC (rev 17335) @@ -96,6 +96,7 @@ struct Object; struct DerivedMesh; struct ShrinkwrapModifierData; +struct MDeformVert; struct BVHTree; @@ -109,6 +110,9 @@ float (*vertexCos)[3]; //vertexs being shrinkwraped int numVerts; + struct MDeformVert* dvert; //Pointer to mdeform array + int vgroup; //Vertex group num + struct DerivedMesh *target; //mesh we are shrinking to SpaceTransform local2target; //transform to move bettwem local and target space Modified: branches/projection-paint/source/blender/blenkernel/intern/blender.c =================================================================== --- branches/projection-paint/source/blender/blenkernel/intern/blender.c 2008-11-05 14:45:54 UTC (rev 17334) +++ branches/projection-paint/source/blender/blenkernel/intern/blender.c 2008-11-05 15:11:40 UTC (rev 17335) @@ -30,11 +30,15 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef WIN32 - #include <unistd.h> // for read close - #include <sys/param.h> // for MAXPATHLEN +#ifndef _WIN32 + #include <unistd.h> // for read close + #include <sys/param.h> // for MAXPATHLEN #else - #include <io.h> // for open close read + #include <io.h> // for open close read @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs