Revision: 14689 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14689 Author: campbellbarton Date: 2008-05-05 15:35:12 +0200 (Mon, 05 May 2008)
Log Message: ----------- merge from trunk Modified Paths: -------------- branches/apricot/CMakeLists.txt branches/apricot/SConstruct branches/apricot/config/darwin-config.py branches/apricot/extern/ffmpeg/SConscript branches/apricot/extern/ffmpeg/patches/README branches/apricot/extern/verse/dist/v_bignum.c branches/apricot/intern/ghost/intern/GHOST_SystemCarbon.cpp branches/apricot/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj branches/apricot/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj branches/apricot/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj branches/apricot/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj branches/apricot/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj branches/apricot/release/scripts/console.py branches/apricot/release/scripts/wizard_curve2tree.py branches/apricot/release/scripts/x3d_export.py branches/apricot/source/blender/blenkernel/BKE_node.h branches/apricot/source/blender/blenkernel/BKE_particle.h branches/apricot/source/blender/blenkernel/intern/DerivedMesh.c branches/apricot/source/blender/blenkernel/intern/image.c branches/apricot/source/blender/blenkernel/intern/library.c branches/apricot/source/blender/blenkernel/intern/mball.c branches/apricot/source/blender/blenkernel/intern/node.c branches/apricot/source/blender/blenkernel/intern/object.c branches/apricot/source/blender/blenkernel/intern/packedFile.c branches/apricot/source/blender/blenkernel/intern/particle.c branches/apricot/source/blender/blenkernel/intern/particle_system.c branches/apricot/source/blender/blenkernel/intern/pointcache.c branches/apricot/source/blender/blenkernel/intern/sound.c branches/apricot/source/blender/blenkernel/intern/text.c branches/apricot/source/blender/blenkernel/intern/writeavi.c branches/apricot/source/blender/blenkernel/intern/writeffmpeg.c branches/apricot/source/blender/blenlib/BLI_blenlib.h branches/apricot/source/blender/blenlib/intern/bpath.c branches/apricot/source/blender/blenlib/intern/util.c branches/apricot/source/blender/blenloader/intern/genfile.c branches/apricot/source/blender/include/BIF_screen.h branches/apricot/source/blender/include/butspace.h branches/apricot/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c branches/apricot/source/blender/python/BPY_interface.c branches/apricot/source/blender/python/BPY_menus.c branches/apricot/source/blender/python/api2_2x/Blender.c branches/apricot/source/blender/python/api2_2x/Library.c branches/apricot/source/blender/python/api2_2x/Library.h branches/apricot/source/blender/python/api2_2x/Node.c branches/apricot/source/blender/python/api2_2x/Sys.c branches/apricot/source/blender/python/api2_2x/doc/LibData.py branches/apricot/source/blender/python/api2_2x/sceneRender.c branches/apricot/source/blender/quicktime/apple/quicktime_export.c branches/apricot/source/blender/render/intern/source/pipeline.c branches/apricot/source/blender/src/buttons_editing.c branches/apricot/source/blender/src/buttons_object.c branches/apricot/source/blender/src/buttons_scene.c branches/apricot/source/blender/src/buttons_shading.c branches/apricot/source/blender/src/drawimage.c branches/apricot/source/blender/src/drawobject.c branches/apricot/source/blender/src/drawview.c branches/apricot/source/blender/src/editcurve.c branches/apricot/source/blender/src/editdeform.c branches/apricot/source/blender/src/editimasel.c branches/apricot/source/blender/src/editipo.c branches/apricot/source/blender/src/editobject.c branches/apricot/source/blender/src/editscreen.c branches/apricot/source/blender/src/editsima.c branches/apricot/source/blender/src/editsound.c branches/apricot/source/blender/src/filesel.c branches/apricot/source/blender/src/fluidsim.c branches/apricot/source/blender/src/ghostwinlay.c branches/apricot/source/blender/src/header_action.c branches/apricot/source/blender/src/header_ipo.c branches/apricot/source/blender/src/header_nla.c branches/apricot/source/blender/src/interface_draw.c branches/apricot/source/blender/src/outliner.c branches/apricot/source/blender/src/screendump.c branches/apricot/source/blender/src/seqaudio.c branches/apricot/source/blender/src/sequence.c branches/apricot/source/blender/src/space.c branches/apricot/source/blender/src/view.c branches/apricot/source/blender/src/writeimage.c branches/apricot/source/blender/src/writemovie.c branches/apricot/source/blender/yafray/intern/export_File.cpp branches/apricot/source/blender/yafray/intern/export_Plugin.cpp branches/apricot/source/creator/creator.c branches/apricot/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp branches/apricot/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp branches/apricot/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp branches/apricot/source/gameengine/Converter/BL_BlenderDataConversion.cpp branches/apricot/source/gameengine/Converter/KX_ConvertActuators.cpp branches/apricot/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp branches/apricot/source/gameengine/GameLogic/SCA_MouseSensor.cpp branches/apricot/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp branches/apricot/source/gameengine/Ketsji/KX_BlenderMaterial.cpp branches/apricot/source/gameengine/Ketsji/KX_BlenderMaterial.h branches/apricot/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp branches/apricot/source/gameengine/Ketsji/KX_GameObject.cpp branches/apricot/source/gameengine/Ketsji/KX_GameObject.h branches/apricot/source/gameengine/Ketsji/KX_Scene.cpp branches/apricot/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp branches/apricot/source/gameengine/Physics/Bullet/CcdPhysicsController.h branches/apricot/source/gameengine/Rasterizer/RAS_BucketManager.cpp branches/apricot/source/gameengine/Rasterizer/RAS_IRenderTools.h branches/apricot/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp Modified: branches/apricot/CMakeLists.txt =================================================================== --- branches/apricot/CMakeLists.txt 2008-05-05 06:38:19 UTC (rev 14688) +++ branches/apricot/CMakeLists.txt 2008-05-05 13:35:12 UTC (rev 14689) @@ -250,6 +250,10 @@ ELSE (MSVC80) SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc) ENDIF(MSVC80) + IF (MSVC90) + SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008) + ENDIF(MSVC90) + SET(QUICKTIME ${LIBDIR}/QTDevWin) SET(QUICKTIME_INC ${QUICKTIME}/CIncludes) Modified: branches/apricot/SConstruct =================================================================== --- branches/apricot/SConstruct 2008-05-05 06:38:19 UTC (rev 14688) +++ branches/apricot/SConstruct 2008-05-05 13:35:12 UTC (rev 14689) @@ -398,9 +398,26 @@ if '.svn' in tn: tn.remove('.svn') for f in tf: + print ">>>", env['BF_INSTALLDIR'], tp, f pluglist.append(tp+os.sep+f) plugtargetlist.append(env['BF_INSTALLDIR']+tp[7:]+os.sep+f) +# header files for plugins +pluglist.append('source/blender/blenpluginapi/documentation.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'documentation.h') +pluglist.append('source/blender/blenpluginapi/externdef.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'externdef.h') +pluglist.append('source/blender/blenpluginapi/floatpatch.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'floatpatch.h') +pluglist.append('source/blender/blenpluginapi/iff.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'iff.h') +pluglist.append('source/blender/blenpluginapi/plugin.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'plugin.h') +pluglist.append('source/blender/blenpluginapi/util.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'util.h') +pluglist.append('source/blender/blenpluginapi/plugin.DEF') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep + 'plugin.def') + plugininstall = [] for targetdir,srcfile in zip(plugtargetlist, pluglist): td, tf = os.path.split(targetdir) Modified: branches/apricot/config/darwin-config.py =================================================================== --- branches/apricot/config/darwin-config.py 2008-05-05 06:38:19 UTC (rev 14688) +++ branches/apricot/config/darwin-config.py 2008-05-05 13:35:12 UTC (rev 14689) @@ -221,9 +221,10 @@ CCFLAGS=SDK_FLAGS+CCFLAGS CXXFLAGS=SDK_FLAGS+CXXFLAGS +# you can add -mssse3 if gcc >= 4.2 if MAC_PROC == 'i386': - REL_CFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mssse3'] - REL_CCFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mssse3'] + REL_CFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3'] + REL_CCFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3'] else: CFLAGS = CFLAGS+['-fno-strict-aliasing'] CCFLAGS = CCFLAGS+['-fno-strict-aliasing'] Modified: branches/apricot/extern/ffmpeg/SConscript =================================================================== --- branches/apricot/extern/ffmpeg/SConscript 2008-05-05 06:38:19 UTC (rev 14688) +++ branches/apricot/extern/ffmpeg/SConscript 2008-05-05 13:35:12 UTC (rev 14689) @@ -3,9 +3,6 @@ Import('env') -print env['BF_FFMPEG_EXTRA'] - - all_libs = ['libavformat', 'libavcodec', 'libswscale', 'libavutil'] root = "extern/ffmpeg" @@ -17,7 +14,6 @@ #--enable-libx264 extra_variables = { } extra_includes = [ "../x264", "../xvidcore/src", "../libmp3lame" ] -#extra_includes = [ "../xvidcore/src" ] import sys import os Modified: branches/apricot/extern/ffmpeg/patches/README =================================================================== --- branches/apricot/extern/ffmpeg/patches/README 2008-05-05 06:38:19 UTC (rev 14688) +++ branches/apricot/extern/ffmpeg/patches/README 2008-05-05 13:35:12 UTC (rev 14689) @@ -25,4 +25,4 @@ within configure --- Peter +-- Peter \ No newline at end of file Modified: branches/apricot/extern/verse/dist/v_bignum.c =================================================================== --- branches/apricot/extern/verse/dist/v_bignum.c 2008-05-05 06:38:19 UTC (rev 14688) +++ branches/apricot/extern/verse/dist/v_bignum.c 2008-05-05 13:35:12 UTC (rev 14689) @@ -768,7 +768,7 @@ for(j = i + 1; j < t; j++) { /* printf("computing uv=%X+2*%X*%X+%X\n", w[i + j], x[1 + j], x[1 + i], c);*/ - uv = x[1 + j] * x[1 + i]; + uv = ((VBigDigs)x[1 + j]) * ((VBigDigs)x[1 + i]); high = (uv & 0x80000000) != 0; uv *= 2; ouv = uv; /* Addition below might wrap and generate high bit. */ Modified: branches/apricot/intern/ghost/intern/GHOST_SystemCarbon.cpp =================================================================== --- branches/apricot/intern/ghost/intern/GHOST_SystemCarbon.cpp 2008-05-05 06:38:19 UTC (rev 14688) +++ branches/apricot/intern/ghost/intern/GHOST_SystemCarbon.cpp 2008-05-05 13:35:12 UTC (rev 14689) @@ -34,10 +34,9 @@ * @date May 7, 2001 */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <Carbon/Carbon.h> +#include <ApplicationServices/ApplicationServices.h> #include "GHOST_SystemCarbon.h" #include "GHOST_DisplayManagerCarbon.h" @@ -52,6 +51,7 @@ #include "GHOST_WindowManager.h" #include "GHOST_WindowCarbon.h" #include "GHOST_NDOFManager.h" +#include "AssertMacros.h" #define GHOST_KEY_SWITCH(mac, ghost) { case (mac): ghostKey = (ghost); break; } @@ -1121,13 +1121,16 @@ OSStatus err = noErr; GHOST_TUns8 * temp_buff; CFRange range; + OSStatus syncFlags; err = PasteboardCreate(kPasteboardClipboard, &inPasteboard); if(err != noErr) { return NULL;} - err = PasteboardSynchronize( inPasteboard ); - if(err != noErr) { return NULL;} + syncFlags = PasteboardSynchronize( inPasteboard ); + /* as we always get in a new string, we can safely ignore sync flags if not an error*/ + if(syncFlags <0) { return NULL;} + err = PasteboardGetItemIdentifier( inPasteboard, 1, &itemID ); if(err != noErr) { return NULL;} @@ -1152,15 +1155,18 @@ void GHOST_SystemCarbon::putClipboard(GHOST_TInt8 *buffer, int flag) const { if(flag == 1) {return;} //If Flag is 1 means the selection and is used on X11 + PasteboardRef inPasteboard; CFDataRef textData = NULL; OSStatus err = noErr; /*For error checking*/ + OSStatus syncFlags; err = PasteboardCreate(kPasteboardClipboard, &inPasteboard); if(err != noErr) { return;} - err = PasteboardSynchronize( inPasteboard ); - if(err != noErr) { return;} + syncFlags = PasteboardSynchronize( inPasteboard ); + /* as we always put in a new string, we can safely ignore sync flags */ + if(syncFlags <0) { return;} err = PasteboardClear( inPasteboard ); if(err != noErr) { return;} Modified: branches/apricot/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj =================================================================== --- branches/apricot/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj 2008-05-05 06:38:19 UTC (rev 14688) +++ branches/apricot/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj 2008-05-05 13:35:12 UTC (rev 14689) @@ -22,7 +22,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics \common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include" - PreprocessorDefinitions="WIN32,_LIB,_DEBUG" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;WITH_GLEXT" BasicRuntimeChecks="3" RuntimeLibrary="1" DefaultCharIsUnsigned="TRUE" Modified: branches/apricot/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj =================================================================== --- branches/apricot/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj 2008-05-05 06:38:19 UTC (rev 14688) +++ branches/apricot/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj 2008-05-05 13:35:12 UTC (rev 14689) @@ -40,12 +40,12 @@ Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386 " - AdditionalDependencies="libguardedalloc.lib libstring.lib libghost.lib 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 libmoto.lib libSoundSystem.lib qtmlClient.lib libDummySoundSystem.lib libOpenALSoundSystem.lib SDL.lib solid.lib freetype2ST.lib Bullet.lib libdecimation.lib python25_d.lib pthreadVSE2.lib pthreadVC2.lib verse.lib libopennl.lib" + AdditionalDependencies="libguardedalloc.lib libstring.lib libghost.lib 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 libmoto.lib libSoundSystem.lib qtmlClient.lib libDummySoundSystem.lib libOpenALSoundSystem.lib SDL.lib solid.lib freetype2ST.lib Bullet.lib libdecimation.lib python25_d.lib pthreadVSE2.lib pthreadVC2.lib verse.lib libopennl.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. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs