svn merge -r 14505:14561 https://svn.blender.org/svnroot/bf-blender/trunk/blender
This commit is contained in:
commit
31fffd00d3
@ -258,7 +258,7 @@ IF(WIN32)
|
||||
|
||||
SET(FFMPEG ${LIBDIR}/ffmpeg)
|
||||
SET(FFMPEG_INC ${FFMPEG}/include)
|
||||
SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49)
|
||||
SET(FFMPEG_LIB avcodec-51 avformat-52 avdevice-52 avutil-49 swscale-0)
|
||||
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
|
||||
|
||||
SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
|
||||
@ -299,7 +299,7 @@ IF(WIN32)
|
||||
SET(WINTAB_INC ${LIBDIR}/wintab/include)
|
||||
|
||||
SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib ")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
|
||||
ENDIF(WIN32)
|
||||
|
||||
IF(APPLE)
|
||||
|
@ -14,7 +14,7 @@ Simplified Chinese:zh_CN
|
||||
Russian:ru_RU
|
||||
Croatian:hr_HR
|
||||
Serbian:sr
|
||||
Ukrainian:uk
|
||||
Ukrainian:uk_UA
|
||||
Polish:pl_PL
|
||||
Romanian:ro
|
||||
Arabic:ar
|
||||
|
@ -46,6 +46,7 @@
|
||||
|
||||
#include <X11/Xatom.h>
|
||||
#include <X11/keysym.h>
|
||||
#include <X11/XKBlib.h> /* allow detectable autorepeate */
|
||||
|
||||
#ifdef __sgi
|
||||
|
||||
@ -111,6 +112,18 @@ GHOST_SystemX11(
|
||||
}
|
||||
|
||||
m_start_time = GHOST_TUns64(tv.tv_sec*1000 + tv.tv_usec/1000);
|
||||
|
||||
|
||||
/* use detectable autorepeate, mac and windows also do this */
|
||||
int use_xkb;
|
||||
int xkb_opcode, xkb_event, xkb_error;
|
||||
int xkb_major = XkbMajorVersion, xkb_minor = XkbMinorVersion;
|
||||
|
||||
use_xkb = XkbQueryExtension(m_display, &xkb_opcode, &xkb_event, &xkb_error, &xkb_major, &xkb_minor);
|
||||
if (use_xkb) {
|
||||
XkbSetDetectableAutoRepeat(m_display, true, NULL);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
GHOST_TSuccess
|
||||
|
@ -21,8 +21,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem"
|
||||
PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem"
|
||||
PreprocessorDefinitions="_DEBUG,WIN32,_LIB;WITH_FFMPEG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
DisableLanguageExtensions="FALSE"
|
||||
@ -75,7 +75,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\lib\windows\ffmpeg\include"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
@ -41,12 +41,12 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib Bullet.lib python25.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib broad.lib complex.lib convex.lib memutil.lib verse.lib Half.lib Iex.lib IlmImf.lib Imath.lib IlmThread.lib"
|
||||
AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib Bullet.lib python25.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib broad.lib complex.lib convex.lib memutil.lib verse.lib Half.lib Iex.lib IlmImf.lib Imath.lib IlmThread.lib avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib"
|
||||
ShowProgress="0"
|
||||
OutputFile="..\..\bin\blender.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\openexr\lib;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_7\libs\intern;..\..\..\build\msvc_7\libs\extern"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\openexr\lib;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_7\libs\intern;..\..\..\build\msvc_7\libs\extern;..\..\..\lib\windows\ffmpeg\lib"
|
||||
IgnoreAllDefaultLibraries="FALSE"
|
||||
IgnoreDefaultLibraryNames="msvcprt.lib;glut32.lib;libc.lib;libcd.lib;libcpd.lib;libcp.lib;libcmtd.lib;odbc32.lib;odbccp32.lib"
|
||||
ProgramDatabaseFile="..\..\..\build\msvc_7\libs\blender.pdb"
|
||||
@ -65,6 +65,7 @@ XCOPY /Y ..\..\..\lib\windows\gettext\lib\*.dll ..\..\bin
|
||||
XCOPY /Y ..\..\..\lib\windows\sdl\lib\*.dll ..\..\bin
|
||||
XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\bin
|
||||
XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll ..\..\bin
|
||||
XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\bin
|
||||
ECHO Copying language folder
|
||||
ECHO Copying python scripts
|
||||
IF NOT EXIST ..\..\bin\.blender\scripts MKDIR ..\..\bin\.blender\scripts
|
||||
@ -123,12 +124,12 @@ ECHO Done
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386
|
||||
"
|
||||
AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib Bullet.lib python25_d.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib broad.lib complex.lib convex.lib memutil.lib verse.lib Half.lib Iex.lib Imath.lib IlmImf.lib IlmThread.lib"
|
||||
AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib Bullet.lib python25_d.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib broad.lib complex.lib convex.lib memutil.lib verse.lib Half.lib Iex.lib Imath.lib IlmImf.lib IlmThread.lib avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib"
|
||||
ShowProgress="0"
|
||||
OutputFile="..\..\bin\debug\blender.exe"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\openexr\lib;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\build\msvc_7\libs\intern\debug;..\..\..\build\msvc_7\libs\extern\debug"
|
||||
AdditionalLibraryDirectories="..\..\..\lib\windows\sdl\lib;..\..\..\lib\windows\ode\lib;..\..\..\lib\windows\zlib\lib;..\..\..\lib\windows\png\lib;..\..\..\lib\windows\jpeg\lib;..\..\..\lib\windows\pthreads\lib;..\..\..\lib\windows\tiff\lib;..\..\..\lib\windows\gettext\lib;..\..\..\lib\windows\freetype\lib;..\..\..\lib\windows\python\lib;..\..\..\lib\windows\openal\lib;..\..\..\lib\windows\openexr\lib;..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\lib\windows\ffmpeg\lib;..\..\..\build\msvc_7\libs\intern\debug;..\..\..\build\msvc_7\libs\extern\debug"
|
||||
IgnoreDefaultLibraryNames="libc.lib, libcmt.lib, msvcrt.lib, libcd.lib, odbc32.lib, odbccp32.lib"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="..\..\..\build\msvc_7\libs\debug\blender.pdb"
|
||||
@ -149,6 +150,7 @@ XCOPY /Y ..\..\..\lib\windows\python\lib\python25_d.dll ..\..\bin\debug
|
||||
XCOPY /Y ..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\bin\debug
|
||||
XCOPY /Y ..\..\..\lib\windows\tiff\lib\*.dll ..\..\bin\debug
|
||||
XCOPY /Y ..\..\..\lib\windows\pthreads\lib\pthreadVSE2.dll ..\..\bin\debug
|
||||
XCOPY /Y ..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\bin\debug
|
||||
ECHO Copying language folder
|
||||
IF NOT EXIST ..\..\bin\debug\.blender MKDIR ..\..\bin\debug\.blender
|
||||
XCOPY /Y ..\..\bin\.blender ..\..\bin\debug\.blender /E
|
||||
|
@ -73,8 +73,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\extern\bullet\include"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET = 1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\extern\bullet\include"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET = 1;WITH_FFMPEG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
DefaultCharIsUnsigned="TRUE"
|
||||
@ -125,8 +125,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\extern\bullet\include"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2;UNWRAPPER;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\extern\bullet\include"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2;UNWRAPPER;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1;WITH_FFMPEG"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
@ -229,8 +229,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\extern\bullet\include"
|
||||
PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_FREETYPE2"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\lib\windows\ffmpeg\include"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2;WITH_FFMPEG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
DefaultCharIsUnsigned="TRUE"
|
||||
@ -281,8 +281,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\extern\bullet\include"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_FREETYPE2,UNWRAPPER"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\lib\windows\ffmpeg\include"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2;UNWRAPPER;WITH_FFMPEG"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
|
@ -21,7 +21,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\extern\ftgl\include;..\..\..\..\lib\windows\gettext\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\include"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\extern\ftgl\include;..\..\..\..\lib\windows\gettext\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WCHAR_T16;HAVE_LC_MESSAGES;FTGL_LIBRARY_STATIC"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
@ -74,7 +74,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\extern\ftgl\include;..\..\..\..\lib\windows\gettext\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\include"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\freetype\include;..\..\..\..\build\msvc_7\extern\ftgl\include;..\..\..\..\lib\windows\gettext\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel"
|
||||
PreprocessorDefinitions="WIN32,_DEBUG,_LIB,WCHAR_T16,HAVE_LC_MESSAGES,FTGL_LIBRARY_STATIC"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
|
@ -21,8 +21,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;WITH_DDS"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;WITH_DDS;WITH_FFMPEG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
DefaultCharIsUnsigned="TRUE"
|
||||
@ -176,8 +176,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;WITH_DDS"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds;..\..\..\..\lib\windows\ffmpeg\include"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;WITH_DDS;WITH_FFMPEG"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
@ -228,8 +228,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
|
||||
PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_QUICKTIME,WITH_DDS"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds;..\..\..\..\lib\windows\ffmpeg\include"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_DDS;WITH_FFMPEG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
DefaultCharIsUnsigned="TRUE"
|
||||
@ -280,8 +280,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_DDS"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds;..\..\..\..\lib\windows\ffmpeg\include"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_DDS;WITH_FFMPEG"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
|
@ -21,8 +21,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\lib\windows\pthreads\include"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER=1;WITH_QUICKTIME;INTERNATIONAL;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER=1;WITH_QUICKTIME;INTERNATIONAL;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1;WITH_FFMPEG"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
@ -73,8 +73,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\lib\windows\pthreads\include"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER;WITH_QUICKTIME;INTERNATIONAL;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET = 1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER;WITH_QUICKTIME;INTERNATIONAL;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET = 1;WITH_FFMPEG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
DefaultCharIsUnsigned="TRUE"
|
||||
|
@ -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"
|
||||
AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\ode\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\fmod\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\python\lib;..\..\..\..\..\lib\windows\openssl\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\build\msvc_7\libs\intern\debug;..\..\..\..\..\build\msvc_7\libs\extern\debug;..\..\..\..\..\lib\windows\pthreads\lib"
|
||||
AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\ode\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\fmod\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\python\lib;..\..\..\..\..\lib\windows\openssl\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\build\msvc_7\libs\intern\debug;..\..\..\..\..\build\msvc_7\libs\extern\debug;..\..\..\..\..\lib\windows\pthreads\lib;..\..\..\..\..\lib\windows\ffmpeg\lib"
|
||||
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;msvcrtd.lib"
|
||||
GenerateDebugInformation="TRUE"
|
||||
ProgramDatabaseFile="..\..\..\..\..\build\msvc_7\libs\debug\blenderplayer.pdb"
|
||||
@ -64,6 +64,7 @@ XCOPY /Y ..\..\..\..\..\lib\windows\python\lib\python25_d.dll ..\..\..\..\bin\de
|
||||
XCOPY /Y ..\..\..\..\..\lib\windows\sdl\lib\SDL.dll ..\..\..\..\bin\debug
|
||||
XCOPY /Y ..\..\..\..\..\lib\windows\png\lib\libpng.dll ..\..\..\..\bin\debug
|
||||
XCOPY /Y ..\..\..\..\..\lib\windows\zlib\lib\zlib.dll ..\..\..\..\bin\debug
|
||||
XCOPY /Y ..\..\..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\..\..\bin\debug
|
||||
XCOPY /Y ..\..\..\..\..\lib\windows\CRTL\lib\msvcrtd.dll ..\..\..\..\bin\debug
|
||||
ECHO Done
|
||||
"/>
|
||||
@ -116,11 +117,11 @@ ECHO Done
|
||||
<Tool
|
||||
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.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.lib pthreadVSE2.lib pthreadVC2.lib verse.lib libopennl.lib avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib"
|
||||
OutputFile="..\..\..\..\bin\blenderplayer.exe"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="TRUE"
|
||||
AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\ode\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\fmod\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\python\lib;..\..\..\..\..\lib\windows\openssl\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\build\msvc_7\libs\intern;..\..\..\..\..\build\msvc_7\libs\extern;..\..\..\..\..\lib\windows\pthreads\lib"
|
||||
AdditionalLibraryDirectories="..\..\..\..\..\lib\windows\sdl\lib;..\..\..\..\..\lib\windows\zlib\lib;..\..\..\..\..\lib\windows\ode\lib;..\..\..\..\..\lib\windows\png\lib;..\..\..\..\..\lib\windows\jpeg\lib;..\..\..\..\..\lib\windows\fmod\lib;..\..\..\..\..\lib\windows\openal\lib;..\..\..\..\..\lib\windows\freetype\lib;..\..\..\..\..\lib\windows\python\lib;..\..\..\..\..\lib\windows\openssl\lib;..\..\..\..\..\lib\windows\QTDevWin\Libraries;..\..\..\..\..\build\msvc_7\libs\intern;..\..\..\..\..\build\msvc_7\libs\extern;..\..\..\..\..\lib\windows\pthreads\lib;..\..\..\..\..\lib\windows\ffmpeg\lib"
|
||||
IgnoreDefaultLibraryNames="libc.lib, msvcrt.lib, libcd.lib, libcmtd.lib, msvcrtd.lib"
|
||||
ProgramDatabaseFile="..\..\..\..\..\build\msvc_7\libs\blenderplayer.pdb"
|
||||
SubSystem="1"/>
|
||||
@ -137,6 +138,7 @@ XCOPY /Y ..\..\..\..\..\lib\windows\python\lib\python25.dll ..\..\..\..\bin
|
||||
XCOPY /Y ..\..\..\..\..\lib\windows\sdl\lib\SDL.dll ..\..\..\..\bin
|
||||
XCOPY /Y ..\..\..\..\..\lib\windows\png\lib\libpng.dll ..\..\..\..\bin
|
||||
XCOPY /Y ..\..\..\..\..\lib\windows\zlib\lib\zlib.dll ..\..\..\..\bin
|
||||
XCOPY /Y ..\..\..\..\..\lib\windows\ffmpeg\lib\*.dll ..\..\..\..\bin
|
||||
ECHO Done
|
||||
"/>
|
||||
<Tool
|
||||
|
@ -62,7 +62,7 @@ int main(int argc, char**argv) {
|
||||
if (argv[1][i]=='.') argv[1][i]='_';
|
||||
|
||||
sprintf(sizest, "%d", (int)size);
|
||||
printf ("Input filesize is %d, Output size should be %d\n", size, ((int)size)*4 + strlen("/* DataToC output of file <> */\n\n") + strlen("char datatoc_[]= {\"") + strlen ("\"};\n") + (strlen(argv[1])*3) + strlen(sizest) + strlen("int datatoc__size= ;\n") +(((int)(size/256)+1)*5));
|
||||
printf ("Input filesize is %ld, Output size should be %ld\n", size, ((int)size)*4 + strlen("/* DataToC output of file <> */\n\n") + strlen("char datatoc_[]= {\"") + strlen ("\"};\n") + (strlen(argv[1])*3) + strlen(sizest) + strlen("int datatoc__size= ;\n") +(((int)(size/256)+1)*5));
|
||||
|
||||
fpout= fopen(cname, "w");
|
||||
if (!fpout) {
|
||||
@ -93,8 +93,8 @@ int main(int argc, char**argv) {
|
||||
/* fprintf (fpout, "\\x%02x", getc(fpin)); */
|
||||
fprintf (fpout, "%3d,", getc(fpin));
|
||||
}
|
||||
|
||||
fprintf (fpout, "\n};\n\n");
|
||||
/* null terminate for the case it is a string */
|
||||
fprintf (fpout, "\n 0};\n\n");
|
||||
|
||||
fclose(fpin);
|
||||
fclose(fpout);
|
||||
|
@ -7,7 +7,7 @@
|
||||
# Tooltip: 'Export to DirectX text file format format for XNA Animation Component Library.'
|
||||
"""
|
||||
__author__ = "minahito (original:Arben (Ben) Omari)"
|
||||
__url__ = ("blender", "elysiun", "Adjuster's site http://sunday-lab.blogspot.com/, Author's site http://www.omariben.too.it")
|
||||
__url__ = ("blender", "blenderartists.org", "Adjuster's site http://sunday-lab.blogspot.com/, Author's site http://www.omariben.too.it")
|
||||
__version__ = "3.0"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -8,7 +8,7 @@ Tip: 'Export selected meshes to AC3D (.ac) format'
|
||||
"""
|
||||
|
||||
__author__ = "Willian P. Germano"
|
||||
__url__ = ("blender", "elysiun", "AC3D's homepage, http://www.ac3d.org",
|
||||
__url__ = ("blender", "blenderartists.org", "AC3D's homepage, http://www.ac3d.org",
|
||||
"PLib 3d gaming lib, http://plib.sf.net")
|
||||
__version__ = "2.44 2007-05-05"
|
||||
|
||||
|
@ -8,7 +8,7 @@ Tip: 'Import an AC3D (.ac) file.'
|
||||
"""
|
||||
|
||||
__author__ = "Willian P. Germano"
|
||||
__url__ = ("blender", "elysiun", "AC3D's homepage, http://www.ac3d.org",
|
||||
__url__ = ("blender", "blenderartists.org", "AC3D's homepage, http://www.ac3d.org",
|
||||
"PLib 3d gaming lib, http://plib.sf.net")
|
||||
__version__ = "2.43.1 2007-02-21"
|
||||
|
||||
|
@ -8,7 +8,7 @@ Tip: 'Bevel selected faces, edges, and vertices'
|
||||
"""
|
||||
|
||||
__author__ = "Loic BERTHE"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "2.0"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -10,7 +10,7 @@ Tooltip: 'View and edit available scripts configuration data'
|
||||
__author__ = "Willian P. Germano"
|
||||
__version__ = "0.1 2005/04/14"
|
||||
__email__ = ('scripts', 'Author, wgermano:ig*com*br')
|
||||
__url__ = ('blender', 'elysiun')
|
||||
__url__ = ('blender', 'blenderartists.org')
|
||||
|
||||
__bpydoc__ ="""\
|
||||
This script can be used to view and edit configuration data stored
|
||||
|
@ -1,14 +1,14 @@
|
||||
#!BPY
|
||||
|
||||
"""
|
||||
Name: 'Interactive Console'
|
||||
Blender: 237
|
||||
Name: 'Interactive Python Console'
|
||||
Blender: 245
|
||||
Group: 'System'
|
||||
Tooltip: 'Interactive Python Console'
|
||||
"""
|
||||
|
||||
__author__ = "Campbell Barton AKA Ideasman"
|
||||
__url__ = ["Author's homepage, http://members.iinet.net.au/~cpbarton/ideasman/", "blender", "elysiun", "Official Python site, http://www.python.org"]
|
||||
__author__ = "Campbell Barton aka ideasman42"
|
||||
__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
|
||||
__bpydoc__ = """\
|
||||
This is an interactive console, similar to Python's own command line interpreter. Since it is embedded in Blender, it has access to all Blender Python modules.
|
||||
|
||||
@ -26,8 +26,6 @@ Usage:<br>
|
||||
- Ctrl + Enter: auto compleate based on variable names and modules loaded -- multiple choices popup a menu;<br>
|
||||
- Shift + Enter: multiline functions -- delays executing code until only Enter is pressed.
|
||||
"""
|
||||
__author__ = "Campbell Barton AKA Ideasman"
|
||||
__url__ = ["http://members.iinet.net.au/~cpbarton/ideasman/", "blender", "elysiun"]
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
# ***** BEGIN GPL LICENSE BLOCK *****
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Make envelope symetrical'
|
||||
"""
|
||||
|
||||
__author__ = "Jonas Petersen"
|
||||
__url__ = ("blender", "elysiun", "Script's homepage, http://www.mindfloaters.de/blender/", "thread at blender.org, http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=4858 ")
|
||||
__url__ = ("blender", "blenderartists.org", "Script's homepage, http://www.mindfloaters.de/blender/", "thread at blender.org, http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=4858 ")
|
||||
__version__ = "0.9 2004-11-10"
|
||||
__doc__ = """\
|
||||
This script creates perfectly symmetrical envelope sets. It is part of the
|
||||
|
@ -8,7 +8,7 @@ Tip: 'Export Loc Rot Size chanels to a Lightwave .mot file'
|
||||
"""
|
||||
|
||||
__author__ = "Daniel Salazar (ZanQdo)"
|
||||
__url__ = ("blender", "elysiun",
|
||||
__url__ = ("blender", "blenderartists.org",
|
||||
"e-mail: zanqdo@gmail.com")
|
||||
__version__ = "16/04/08"
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'Same Weights...'
|
||||
Blender: 241
|
||||
Blender: 245
|
||||
Group: 'FaceSelect'
|
||||
Tooltip: 'Select same faces with teh same weight for the active group.'
|
||||
"""
|
||||
|
||||
__author__ = ["Campbell Barton"]
|
||||
__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
|
||||
__author__ = ["Campbell Barton aka ideasman42"]
|
||||
__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
|
||||
__version__ = "0.1"
|
||||
__bpydoc__ = """\
|
||||
|
||||
|
@ -8,7 +8,7 @@ Tip: 'Export to OpenFlight v16.0 (.flt)'
|
||||
|
||||
__author__ = "Greg MacDonald, Geoffrey Bantle"
|
||||
__version__ = "2.0 11/21/07"
|
||||
__url__ = ("blender", "elysiun", "Author's homepage, http://sourceforge.net/projects/blight/")
|
||||
__url__ = ("blender", "blenderartists.org", "Author's homepage, http://sourceforge.net/projects/blight/")
|
||||
__bpydoc__ = """\
|
||||
This script exports v16.0 OpenFlight files. OpenFlight is a
|
||||
registered trademark of MultiGen-Paradigm, Inc.
|
||||
|
@ -10,7 +10,7 @@ Tip: 'Import OpenFlight (.flt)'
|
||||
|
||||
__author__ = "Greg MacDonald, Campbell Barton, Geoffrey Bantle"
|
||||
__version__ = "2.0 11/21/07"
|
||||
__url__ = ("blender", "elysiun", "Author's homepage, http://sourceforge.net/projects/blight/")
|
||||
__url__ = ("blender", "blenderartists.org", "Author's homepage, http://sourceforge.net/projects/blight/")
|
||||
__bpydoc__ = """\
|
||||
This script imports OpenFlight files into Blender. OpenFlight is a
|
||||
registered trademark of MultiGen-Paradigm, Inc.
|
||||
|
@ -10,7 +10,7 @@ Tooltip: 'Manage FLT colors'
|
||||
__author__ = "Geoffrey Bantle"
|
||||
__version__ = "1.0 11/21/2007"
|
||||
__email__ = ('scripts', 'Author, ')
|
||||
__url__ = ('blender', 'elysiun')
|
||||
__url__ = ('blender', 'blenderartists.org')
|
||||
|
||||
__bpydoc__ ="""\
|
||||
|
||||
|
@ -10,7 +10,7 @@ Tooltip: 'Tools for working with FLT databases'
|
||||
__author__ = "Geoffrey Bantle"
|
||||
__version__ = "1.0 11/21/07"
|
||||
__email__ = ('scripts', 'Author, ')
|
||||
__url__ = ('blender', 'elysiun')
|
||||
__url__ = ('blender', 'blenderartists.org')
|
||||
|
||||
__bpydoc__ ="""\
|
||||
This script provides tools for working with OpenFlight databases in Blender. OpenFlight is a
|
||||
|
@ -10,7 +10,7 @@ Tooltip: 'Show help information about a chosen installed script.'
|
||||
__author__ = "Willian P. Germano"
|
||||
__version__ = "0.1 11/02/04"
|
||||
__email__ = ('scripts', 'Author, wgermano:ig*com*br')
|
||||
__url__ = ('blender', 'elysiun')
|
||||
__url__ = ('blender', 'blenderartists.org')
|
||||
|
||||
__bpydoc__ ="""\
|
||||
This script shows help information for scripts registered in the menus.
|
||||
@ -84,8 +84,7 @@ DEFAULT_EMAILS = {
|
||||
}
|
||||
|
||||
DEFAULT_LINKS = {
|
||||
'blender': ["blender.org\'s Python forum", "http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewforum&f=9"],
|
||||
'elysiun': ["elYsiun\'s Python and Plugins forum", "http://www.elysiun.com/forum/viewforum.php?f=5"]
|
||||
'blender': ["blender.org\'s Python forum", "http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewforum&f=9"]
|
||||
}
|
||||
|
||||
PADDING = 15
|
||||
|
@ -7,7 +7,7 @@ Tooltip: 'Help for new users'
|
||||
"""
|
||||
|
||||
__author__ = "Matt Ebb"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0"
|
||||
__bpydoc__ = """\
|
||||
This script opens the user's default web browser at www.blender3d.org's
|
||||
|
@ -7,7 +7,7 @@ Tooltip: 'The Blender reference manual'
|
||||
"""
|
||||
|
||||
__author__ = "Matt Ebb"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0"
|
||||
__bpydoc__ = """\
|
||||
This script opens the user's default web browser at www.blender3d.org's
|
||||
|
@ -7,7 +7,7 @@ Tooltip: 'Information about the changes in this version of Blender'
|
||||
"""
|
||||
|
||||
__author__ = "Matt Ebb"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0"
|
||||
__bpydoc__ = """\
|
||||
This script opens the user's default web browser at www.blender3d.org's
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Tutorials for learning to use Blender'
|
||||
"""
|
||||
|
||||
__author__ = "Matt Ebb"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0"
|
||||
__bpydoc__ = """\
|
||||
This script opens the user's default web browser at www.blender3d.org's
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'The official Blender website'
|
||||
"""
|
||||
|
||||
__author__ = "Matt Ebb"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0"
|
||||
__bpydoc__ = """\
|
||||
This script opens the user's default web browser at Blender's main site,
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Get involved with Blender development'
|
||||
"""
|
||||
|
||||
__author__ = "Matt Ebb"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0"
|
||||
__bpydoc__ = """\
|
||||
This script opens the user's default web browser at www.blender.org, the
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Buy official Blender resources and merchandise online'
|
||||
"""
|
||||
|
||||
__author__ = "Matt Ebb"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0"
|
||||
__bpydoc__ = """\
|
||||
This script opens the user's default web browser at www.blender3d.org's
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Get involved with other Blender users'
|
||||
"""
|
||||
|
||||
__author__ = "Matt Ebb"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0"
|
||||
__bpydoc__ = """\
|
||||
This script opens the user's default web browser at www.blender3d.org's
|
||||
|
@ -7,7 +7,7 @@ Tooltip: 'Open in an application for editing. (hold Shift to configure)'
|
||||
"""
|
||||
|
||||
__author__ = "Campbell Barton"
|
||||
__url__ = ["blender", "elysiun"]
|
||||
__url__ = ["blender", "blenderartists.org"]
|
||||
__version__ = "1.0"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -8,7 +8,7 @@ Tip: 'Import Loc Rot Size chanels from a Lightwave .mot file'
|
||||
"""
|
||||
|
||||
__author__ = "Daniel Salazar (ZanQdo)"
|
||||
__url__ = ("blender", "elysiun",
|
||||
__url__ = ("blender", "blenderartists.org",
|
||||
"e-mail: zanqdo@gmail.com")
|
||||
__version__ = "16/04/08"
|
||||
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Export selected meshes to LightWave File Format (.lwo)'
|
||||
"""
|
||||
|
||||
__author__ = "Anthony D'Agostino (Scorpius)"
|
||||
__url__ = ("blender", "elysiun",
|
||||
__url__ = ("blender", "blenderartists.org",
|
||||
"Author's homepage, http://www.redrival.com/scorpius")
|
||||
__version__ = "Part of IOSuite 0.5"
|
||||
|
||||
|
@ -10,7 +10,7 @@ Tooltip: 'Export to Quake file format (.md2).'
|
||||
__author__ = 'Bob Holcomb'
|
||||
__version__ = '0.18.1 patch 1'
|
||||
__url__ = ["Bob's site, http://bane.servebeer.com",
|
||||
"Support forum, http://bane.servebeer.com", "blender", "elysiun"]
|
||||
"Support forum, http://bane.servebeer.com", "blender", "blenderartists.org"]
|
||||
__email__ = ["Bob Holcomb, bob_holcomb:hotmail*com", "scripts"]
|
||||
__bpydoc__ = """\
|
||||
This script Exports a Quake 2 file (MD2).
|
||||
|
@ -10,7 +10,7 @@ Tooltip: 'Import from Quake file format (.md2).'
|
||||
__author__ = 'Bob Holcomb'
|
||||
__version__ = '0.16'
|
||||
__url__ = ["Bob's site, http://bane.servebeer.com",
|
||||
"Support forum, http://scourage.servebeer.com/phpbb/", "blender", "elysiun"]
|
||||
"Support forum, http://scourage.servebeer.com/phpbb/", "blender", "blenderartists.org"]
|
||||
__email__ = ["Bob Holcomb, bob_holcomb:hotmail*com", "scripts"]
|
||||
__bpydoc__ = """\
|
||||
This script imports a Quake 2 file (MD2), textures,
|
||||
|
@ -1,13 +1,13 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'Bone Weight Copy'
|
||||
Blender: 243
|
||||
Blender: 245
|
||||
Group: 'Object'
|
||||
Tooltip: 'Copy Bone Weights from 1 mesh, to all other selected meshes.'
|
||||
"""
|
||||
|
||||
__author__ = ["Campbell Barton"]
|
||||
__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
|
||||
__author__ = "Campbell Barton aka ideasman42"
|
||||
__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
|
||||
__version__ = "0.1"
|
||||
__bpydoc__ = """\
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'Clean Meshes'
|
||||
Blender: 242
|
||||
Blender: 245
|
||||
Group: 'Mesh'
|
||||
Tooltip: 'Clean unused data from all selected mesh objects.'
|
||||
"""
|
||||
|
||||
__author__ = ["Campbell Barton"]
|
||||
__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
|
||||
__author__ = "Campbell Barton aka ideasman42"
|
||||
__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
|
||||
__version__ = "0.1"
|
||||
__bpydoc__ = """\
|
||||
Clean Meshes
|
||||
|
@ -6,7 +6,7 @@ Group: 'Mesh'
|
||||
Tip: 'Edges not used by a face are converted into polyline(s)'
|
||||
"""
|
||||
__author__ = ("Campbell Barton")
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0 2006/02/08"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -6,8 +6,8 @@ Group: 'Mesh'
|
||||
Tooltip: 'Snap Verticies to X mirrord locations and weights.'
|
||||
"""
|
||||
|
||||
__author__= ['Campbell Barton']
|
||||
__url__= ["blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/"]
|
||||
__author__ = "Campbell Barton aka ideasman42"
|
||||
__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
|
||||
__version__= '1.0'
|
||||
__bpydoc__= '''\
|
||||
This script is used to mirror vertex locations and weights
|
||||
|
@ -7,7 +7,7 @@ Tooltip: 'Removed polygons from a mesh while maintaining the shape, textures and
|
||||
"""
|
||||
|
||||
__author__ = "Campbell Barton"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0 2006/02/07"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -8,7 +8,7 @@ Tip: 'Copy data from active object to other selected ones.'
|
||||
"""
|
||||
|
||||
__author__ = "Jean-Michel Soler (jms), Campbell Barton (Ideasman42)"
|
||||
__url__ = ("blender", "elysiun",
|
||||
__url__ = ("blender", "blenderartists.org",
|
||||
"Script's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_lampdatacopier.htm",
|
||||
"Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender")
|
||||
__version__ = "0.1.2"
|
||||
|
@ -12,7 +12,7 @@ __author__ = "Martin Poirier (theeth), Jean-Michel Soler (jms), Campbell Barton
|
||||
# Martin Poirier's Apply_Def.py and
|
||||
# Jean-Michel Soler's Fix From Everything
|
||||
|
||||
__url__ = ("http://www.blender.org", "http://blenderartists.org", "http://members.iinet.net.au/~cpbarton/ideasman/", "http://jmsoler.free.fr")
|
||||
__url__ = ("http://www.blender.org", "http://blenderartists.org", "http://jmsoler.free.fr")
|
||||
__version__ = "1.6 07/07/2006"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -6,7 +6,7 @@ Group: 'Object'
|
||||
Tooltip: 'Apply the chosen rule to rename all selected objects at once.'
|
||||
"""
|
||||
__author__ = "Campbell Barton"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Export selected mesh to DEC Object File Format (*.off)'
|
||||
"""
|
||||
|
||||
__author__ = "Anthony D'Agostino (Scorpius)"
|
||||
__url__ = ("blender", "elysiun",
|
||||
__url__ = ("blender", "blenderartists.org",
|
||||
"Author's homepage, http://www.redrival.com/scorpius")
|
||||
__version__ = "Part of IOSuite 0.5"
|
||||
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Import DEC Object File Format (*.off)'
|
||||
"""
|
||||
|
||||
__author__ = "Anthony D'Agostino (Scorpius), Campbell Barton (Ideasman)"
|
||||
__url__ = ("blender", "elysiun",
|
||||
__url__ = ("blender", "blenderartists.org",
|
||||
"Author's homepage, http://www.redrival.com/scorpius")
|
||||
__version__ = "Part of IOSuite 0.5"
|
||||
|
||||
|
@ -13,7 +13,7 @@ Tip: 'Import a path from any of a set of formats (still experimental)'
|
||||
"""
|
||||
|
||||
__author__ = "Jean-Michel Soler (jms)"
|
||||
__url__ = ("blender", "elysiun",
|
||||
__url__ = ("blender", "blenderartists.org",
|
||||
"AI importer's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_import_ai.htm",
|
||||
"Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender")
|
||||
__version__ = "0.1.1"
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Export selected mesh to Raw Triangle Format (.raw)'
|
||||
"""
|
||||
|
||||
__author__ = "Anthony D'Agostino (Scorpius)"
|
||||
__url__ = ("blender", "elysiun",
|
||||
__url__ = ("blender", "blenderartists.org",
|
||||
"Author's homepage, http://www.redrival.com/scorpius")
|
||||
__version__ = "Part of IOSuite 0.5"
|
||||
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Import Raw Triangle File Format (.raw)'
|
||||
"""
|
||||
|
||||
__author__ = "Anthony D'Agostino (Scorpius)"
|
||||
__url__ = ("blender", "elysiun",
|
||||
__url__ = ("blender", "blenderartists.org",
|
||||
"Author's homepage, http://www.redrival.com/scorpius")
|
||||
__version__ = "Part of IOSuite 0.5"
|
||||
|
||||
|
@ -8,7 +8,7 @@ Tip: 'GUI to select and rename objects.'
|
||||
"""
|
||||
|
||||
__author__ = "Jean-Michel Soler (jms)"
|
||||
__url__ = ("blender", "elysiun",
|
||||
__url__ = ("blender", "blenderartists.org",
|
||||
"Script's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_renameobjectgui.htm",
|
||||
"Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender")
|
||||
__version__ = "233"
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Save current renderlayers as a BPython script'
|
||||
"""
|
||||
|
||||
__author__ = "Campbell Barton"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -8,7 +8,7 @@ Tip: 'Copy deform data (not surf. subdiv) of active obj to rvk of the 2nd select
|
||||
"""
|
||||
|
||||
__author__ = "Jean-Michel Soler (jms)"
|
||||
__url__ = ("blender", "elysiun",
|
||||
__url__ = ("blender", "blenderartists.org",
|
||||
"Script's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_rvk1versrvk2.htm",
|
||||
"Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender")
|
||||
__version__ = "2007/04/27"
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Save current theme as a BPython script'
|
||||
"""
|
||||
|
||||
__author__ = "Willian P. Germano"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "2.43 2006/12/30"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
104
release/scripts/scripttemplate_camer_object.py
Normal file
104
release/scripts/scripttemplate_camer_object.py
Normal file
@ -0,0 +1,104 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'Camera/Object Example'
|
||||
Blender: 245
|
||||
Group: 'ScriptTemplate'
|
||||
Tooltip: 'Script template for setting the camera direction'
|
||||
"""
|
||||
|
||||
from Blender import Window
|
||||
import bpy
|
||||
|
||||
script_data = \
|
||||
'''#!BPY
|
||||
"""
|
||||
Name: 'My Camera script'
|
||||
Blender: 245
|
||||
Group: 'Object'
|
||||
Tooltip: 'Rotate the camera to center on the active object'
|
||||
"""
|
||||
|
||||
import Blender
|
||||
from Blender import Window, Scene, Draw, Mathutils
|
||||
|
||||
# Rotate the camera in such a way that it centers on the currently active object
|
||||
def RotCamToOb(cam, ob):
|
||||
|
||||
# Get the camera matrix
|
||||
camMat = cam.getMatrix('worldspace');
|
||||
|
||||
# Get the location of the camera and object and make sure they're vectors
|
||||
camLoc = Mathutils.Vector(cam.loc)
|
||||
obLoc = Mathutils.Vector(ob.loc)
|
||||
|
||||
# Get the vector (direction) from the camera to the object
|
||||
newVec = obLoc - camLoc
|
||||
|
||||
# Make a quaternion that points the camera along the vector
|
||||
newQuat = newVec.toTrackQuat('-z', 'y')
|
||||
|
||||
# Convert the new quaternion to a rotation matrix (and resize it to 4x4 so it matches the other matrices)
|
||||
rotMat = newQuat.toMatrix().resize4x4()
|
||||
|
||||
# Make a matrix with only the current location of the camera
|
||||
transMat = Mathutils.TranslationMatrix(camMat.translationPart());
|
||||
|
||||
# Multiply the rotation and translation matrixes to make 1 matrix with all data
|
||||
newMat = rotMat * transMat
|
||||
|
||||
# Now we make this matrix the camera matrix and voila done!
|
||||
cam.setMatrix(newMat)
|
||||
|
||||
#Make sure blender and the objects are in the right state and start doing stuff
|
||||
def SceneCheck():
|
||||
|
||||
# Show a neat waitcursor whilst the script runs
|
||||
Window.WaitCursor(1)
|
||||
|
||||
# If we are in edit mode, go out of edit mode and store the status in a var
|
||||
emode = int(Window.EditMode())
|
||||
if emode: Window.EditMode(0)
|
||||
|
||||
# Get the scene, the camera and the currently active object
|
||||
scn = Scene.GetCurrent()
|
||||
cam = scn.getCurrentCamera()
|
||||
ob = scn.getActiveObject()
|
||||
|
||||
# Lets do some checks to make sure we have everything
|
||||
# And if we don't then call a return which stops the entire script
|
||||
if not cam:
|
||||
Draw.PupMenu('Error, no active camera, aborting.')
|
||||
return
|
||||
|
||||
if not ob:
|
||||
Draw.PupMenu('Error, no active object, aborting.')
|
||||
return
|
||||
|
||||
if cam == ob:
|
||||
Draw.PupMenu('Error, select an object other than the camera, aborting.')
|
||||
return
|
||||
|
||||
# Start the main function of the script if we didn't encounter any errors
|
||||
RotCamToOb(cam, ob)
|
||||
|
||||
# Update the scene
|
||||
scn.update()
|
||||
|
||||
# Redraw the 3d view so we can instantly see what was changed
|
||||
Window.Redraw(Window.Types.VIEW3D)
|
||||
|
||||
# If we were in edit mode when the script started, go back into edit mode
|
||||
if emode: Window.EditMode(1)
|
||||
|
||||
# Remove the waitcursor
|
||||
Window.WaitCursor(0)
|
||||
|
||||
# Start the script
|
||||
SceneCheck()
|
||||
|
||||
'''
|
||||
|
||||
new_text = bpy.data.texts.new('camobject_template.py')
|
||||
new_text.write(script_data)
|
||||
bpy.data.texts.active = new_text
|
||||
Window.RedrawAll()
|
92
release/scripts/scripttemplate_ipo_gen.py
Normal file
92
release/scripts/scripttemplate_ipo_gen.py
Normal file
@ -0,0 +1,92 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'Camera/Object Example'
|
||||
Blender: 245
|
||||
Group: 'ScriptTemplate'
|
||||
Tooltip: 'Script template for setting the camera direction'
|
||||
"""
|
||||
|
||||
from Blender import Window
|
||||
import bpy
|
||||
|
||||
script_data = \
|
||||
'''#!BPY
|
||||
"""
|
||||
Name: 'My Ipo Script'
|
||||
Blender: 245
|
||||
Group: 'Animation'
|
||||
Tooltip: 'Put some useful info here'
|
||||
"""
|
||||
|
||||
# Add a licence here if you wish to re-distribute, we recommend the GPL
|
||||
|
||||
from Blender import Ipo, Mathutils, Window
|
||||
import bpy, BPyMessages
|
||||
|
||||
def makeRandomIpo(object, firstFrame, numberOfFrames, frameStep):
|
||||
# Create an new Ipo Curve of name myIpo and type Object
|
||||
myIpo = bpy.data.ipos.new('myIpo', 'Object')
|
||||
|
||||
# Create LocX, LocY, and LocZ Ipo curves in our new Curve Object
|
||||
# and store them so we can access them later
|
||||
myIpo_x = myIpo.addCurve('LocX')
|
||||
myIpo_y = myIpo.addCurve('LocY')
|
||||
myIpo_z = myIpo.addCurve('LocZ')
|
||||
|
||||
# What value we want to scale our random value by
|
||||
ipoScale = 4
|
||||
|
||||
# This Calculates the End Frame for use in an xrange() expression
|
||||
endFrame = firstFrame + (numberOfFrames * frameStep) + frameStep
|
||||
|
||||
for frame in xrange(firstFrame, endFrame, frameStep):
|
||||
|
||||
# Use the Mathutils Rand() function to get random numbers
|
||||
ipoValue_x = Mathutils.Rand(-1, 1) * ipoScale
|
||||
ipoValue_y = Mathutils.Rand(-1, 1) * ipoScale
|
||||
ipoValue_z = Mathutils.Rand(-1, 1) * ipoScale
|
||||
|
||||
# Append to the Ipo curve at location frame, with the value ipoValue_x
|
||||
# Note that we should pass the append function a tuple or a BezTriple
|
||||
myIpo_x.append((frame, ipoValue_x))
|
||||
|
||||
# Similar to above
|
||||
myIpo_y.append((frame, ipoValue_y))
|
||||
myIpo_z.append((frame, ipoValue_z))
|
||||
|
||||
# Link our new Ipo Curve to the passed object
|
||||
object.setIpo(myIpo)
|
||||
print object
|
||||
|
||||
|
||||
def main():
|
||||
|
||||
# Get the active scene, since there can be multiple ones
|
||||
sce = bpy.data.scenes.active
|
||||
|
||||
# Get the active object
|
||||
object = sce.objects.active
|
||||
|
||||
# If there is no active object, pop up an error message
|
||||
if not object:
|
||||
BPyMessages.Error_NoActive()
|
||||
|
||||
Window.WaitCursor(1)
|
||||
|
||||
# Call our makeRandomIpo function
|
||||
# Pass it our object, Tell it to keys from the start frame until the end frame, at a step of 10 frames
|
||||
# between them
|
||||
|
||||
makeRandomIpo(object, sce.render.sFrame, sce.render.eFrame, 10)
|
||||
|
||||
Window.WaitCursor(0)
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
'''
|
||||
|
||||
new_text = bpy.data.texts.new('ipo_template.py')
|
||||
new_text.write(script_data)
|
||||
bpy.data.texts.active = new_text
|
||||
Window.RedrawAll()
|
76
release/scripts/scripttemplate_metaball_create.py
Normal file
76
release/scripts/scripttemplate_metaball_create.py
Normal file
@ -0,0 +1,76 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'Metaball Generation'
|
||||
Blender: 245
|
||||
Group: 'ScriptTemplate'
|
||||
Tooltip: 'Script template to make metaballs from a mesh'
|
||||
"""
|
||||
|
||||
from Blender import Window
|
||||
import bpy
|
||||
|
||||
script_data = \
|
||||
'''#!BPY
|
||||
"""
|
||||
Name: 'My Metaball Script'
|
||||
Blender: 245
|
||||
Group: 'Misc'
|
||||
Tooltip: 'Put some useful info here'
|
||||
"""
|
||||
|
||||
# Add a license here if you wish to re-disribute, we recommend the GPL
|
||||
|
||||
from Blender import Metaball, Mesh, Window
|
||||
import bpy
|
||||
|
||||
def makeMetaSculpture(sce):
|
||||
#Create a base mesh for our sculpture to use
|
||||
monkey = Mesh.Primitives.Monkey()
|
||||
|
||||
#Create a new meta datablock to use and give it a name
|
||||
metaObj = Metaball.New()
|
||||
metaObj.name = "MetaSuzanne"
|
||||
|
||||
#Increase the resolution so it looks better
|
||||
metaObj.wiresize = 0.2
|
||||
metaObj.rendersize = 0.1
|
||||
|
||||
#The radius for our new meta objects to take
|
||||
metaRadius = 2.0
|
||||
|
||||
for f in monkey.faces:
|
||||
|
||||
#Create a new metaball as part of the Meta Object Data
|
||||
newBall = metaObj.elements.add()
|
||||
|
||||
#Make the new ball have the same coordinates as a vertex on our Mesh
|
||||
newBall.co = f.cent
|
||||
|
||||
#Assign the same radius to all balls
|
||||
newBall.radius = f.area * metaRadius
|
||||
|
||||
#Create the new object and put our meta data there
|
||||
sce.objects.new(metaObj, "MetaSuzanne")
|
||||
|
||||
|
||||
def main():
|
||||
scene = bpy.data.scenes.active #Get the active scene
|
||||
|
||||
Window.WaitCursor(1)
|
||||
|
||||
#Call the sculpture making function
|
||||
makeMetaSculpture(scene)
|
||||
|
||||
Window.WaitCursor(0)
|
||||
|
||||
#Redraw the Screen When Finished
|
||||
Window.RedrawAll(1)
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
'''
|
||||
|
||||
new_text = bpy.data.texts.new('metaball_template.py')
|
||||
new_text.write(script_data)
|
||||
bpy.data.texts.active = new_text
|
||||
Window.RedrawAll()
|
@ -13,7 +13,7 @@ script_data = \
|
||||
'''#!BPY
|
||||
"""
|
||||
Name: 'My Object Script'
|
||||
Blender: 244
|
||||
Blender: 245
|
||||
Group: 'Object'
|
||||
Tooltip: 'Put some useful info here'
|
||||
"""
|
||||
@ -78,4 +78,4 @@ if __name__ == '__main__':
|
||||
new_text = bpy.data.texts.new('object_template.py')
|
||||
new_text.write(script_data)
|
||||
bpy.data.texts.active = new_text
|
||||
Window.RedrawAll()
|
||||
Window.RedrawAll()
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Import Pro Engineer (.slp) File Format'
|
||||
"""
|
||||
|
||||
__author__ = "Anthony D'Agostino (Scorpius)"
|
||||
__url__ = ("blender", "elysiun",
|
||||
__url__ = ("blender", "blenderartists.org",
|
||||
"Author's homepage, http://www.redrival.com/scorpius")
|
||||
__version__ = "Part of IOSuite 0.5"
|
||||
|
||||
|
@ -8,7 +8,7 @@ Tooltip: 'Information about your Blender environment, useful to diagnose problem
|
||||
"""
|
||||
|
||||
__author__ = "Willian P. Germano"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blenderartists.org", "blenderartists.org")
|
||||
__version__ = "1.1"
|
||||
__bpydoc__ = """\
|
||||
This script creates a text in Blender's Text Editor with information
|
||||
|
@ -7,7 +7,7 @@ Tip: 'Unweld all faces from a (or several) selected and common vertex. Made vert
|
||||
"""
|
||||
|
||||
__author__ = "Jean-Michel Soler (jms)"
|
||||
__url__ = ("blender", "elysiun",
|
||||
__url__ = ("blender", "blenderartists.org",
|
||||
"Script's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_faces2vertex.htm#exemple",
|
||||
"Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender")
|
||||
__version__ = "0.4.6 "
|
||||
|
@ -6,7 +6,7 @@ Group: 'UVCalculation'
|
||||
Tooltip: 'Assign UVs to selected faces from surrounding unselected faces.'
|
||||
"""
|
||||
__author__ = "Campbell Barton"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0 2006/02/07"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -6,7 +6,7 @@ Group: 'UVCalculation'
|
||||
Tooltip: 'Follow from active quads.'
|
||||
"""
|
||||
__author__ = "Campbell Barton"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0 2006/02/07"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -5,8 +5,8 @@ Blender: 242
|
||||
Group: 'UVCalculation'
|
||||
Tooltip: 'Give each face non overlapping space on a texture.'
|
||||
"""
|
||||
__author__ = "Campbell Barton"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__author__ = "Campbell Barton aka ideasman42"
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.0 2006/02/07"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
""" Registration info for Blender menus: <- these words are ignored
|
||||
Name: 'Click project from face'
|
||||
Blender: 242
|
||||
Blender: 245
|
||||
Group: 'UVCalculation'
|
||||
Tooltip: '3 Clicks to project uvs onto selected faces.'
|
||||
"""
|
||||
|
||||
__author__ = ["Campbell Barton"]
|
||||
__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
|
||||
__author__ = "Campbell Barton aka ideasman42"
|
||||
__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
|
||||
__version__ = "0.1"
|
||||
__bpydoc__=\
|
||||
'''
|
||||
|
@ -9,7 +9,7 @@ Tooltip: 'UV Unwrap mesh faces for all select mesh objects'
|
||||
|
||||
|
||||
__author__ = "Campbell Barton"
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.1 12/18/05"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -7,9 +7,7 @@ Tip: 'Copy UV coords from a mesh to another that has same vertex indices'
|
||||
"""
|
||||
|
||||
__author__ = "Toni Alatalo, Martin Poirier et. al."
|
||||
__url__ = ("blender", "elysiun",
|
||||
"Script's homepage, http://www.elysiun.com/forum/viewtopic.php?t=14897",
|
||||
"Communicate problems and errors, http://www.elysiun.com/forum/viewtopic.php?t=14897")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "0.2 01/2006"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -1,13 +1,13 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'VCol Gradient...'
|
||||
Blender: 241
|
||||
Blender: 245
|
||||
Group: 'VertexPaint'
|
||||
Tooltip: 'Click on the start and end grad points for the mesh for selected faces.'
|
||||
"""
|
||||
|
||||
__author__ = ["Campbell Barton"]
|
||||
__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
|
||||
__author__ = "Campbell Barton aka ideasman42"
|
||||
__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
|
||||
__version__ = "0.1"
|
||||
|
||||
# ***** BEGIN GPL LICENSE BLOCK *****
|
||||
|
@ -1,13 +1,13 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'Self Shadow VCols (AO)...'
|
||||
Blender: 241
|
||||
Blender: 245
|
||||
Group: 'VertexPaint'
|
||||
Tooltip: 'Generate Fake Ambient Occlusion with vertex colors.'
|
||||
"""
|
||||
|
||||
__author__ = ["Campbell Barton"]
|
||||
__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
|
||||
__author__ = "Campbell Barton aka ideasman42"
|
||||
__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
|
||||
__version__ = "0.1"
|
||||
__bpydoc__ = """\
|
||||
|
||||
|
@ -10,7 +10,7 @@ Tooltip: 'Export to VRML97 file (.wrl)'
|
||||
"""
|
||||
|
||||
__author__ = ("Rick Kimball", "Ken Miller", "Steve Matthews", "Bart")
|
||||
__url__ = ["blender", "elysiun",
|
||||
__url__ = ["blender", "blenderartists.org",
|
||||
"Author's (Rick) homepage, http://kimballsoftware.com/blender",
|
||||
"Author's (Bart) homepage, http://www.neeneenee.de/vrml"]
|
||||
__email__ = ["Bart, bart:neeneenee*de"]
|
||||
|
@ -1,13 +1,13 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'Clean Weight...'
|
||||
Blender: 241
|
||||
Blender: 245
|
||||
Group: 'WeightPaint'
|
||||
Tooltip: 'Removed verts from groups below a weight limit.'
|
||||
"""
|
||||
|
||||
__author__ = ["Campbell Barton"]
|
||||
__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
|
||||
__author__ = "Campbell Barton aka ideasman42"
|
||||
__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
|
||||
__version__ = "0.1"
|
||||
__bpydoc__ = """\
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'Weight Gradient...'
|
||||
Blender: 241
|
||||
Blender: 245
|
||||
Group: 'WeightPaint'
|
||||
Tooltip: 'Click on the start and end grad points for the mesh for selected faces.'
|
||||
"""
|
||||
|
||||
__author__ = ["Campbell Barton"]
|
||||
__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
|
||||
__author__ = "Campbell Barton aka ideasman42"
|
||||
__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
|
||||
__version__ = "0.1"
|
||||
__bpydoc__=\
|
||||
'''
|
||||
|
@ -1,13 +1,13 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'Grow/Shrink Weight...'
|
||||
Blender: 241
|
||||
Blender: 245
|
||||
Group: 'WeightPaint'
|
||||
Tooltip: 'Grow/Shrink active vertex group.'
|
||||
"""
|
||||
|
||||
__author__ = ["Campbell Barton"]
|
||||
__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
|
||||
__author__ = "Campbell Barton aka ideasman42"
|
||||
__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
|
||||
__version__ = "0.1"
|
||||
__bpydoc__ = """\
|
||||
|
||||
|
@ -1,13 +1,13 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'Normalize/Scale Weight...'
|
||||
Blender: 241
|
||||
Blender: 245
|
||||
Group: 'WeightPaint'
|
||||
Tooltip: 'Normalize the weight of the active weightgroup.'
|
||||
"""
|
||||
|
||||
__author__ = ["Campbell Barton"]
|
||||
__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/")
|
||||
__author__ = "Campbell Barton aka ideasman42"
|
||||
__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"]
|
||||
__version__ = "0.1"
|
||||
__bpydoc__ = """\
|
||||
|
||||
|
@ -8,7 +8,7 @@ Tip: 'Adds Widgets for Driven Shapes'
|
||||
"""
|
||||
|
||||
__author__ = ["Johnny Matthews (guitargeek)"]
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "0.0.9 12/15/05"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -7,7 +7,7 @@ Tooltip: 'Export selected mesh to xfig Format (.fig)'
|
||||
"""
|
||||
|
||||
__author__ = 'Dino Ghilardi', 'Campbell Barton AKA Ideasman42'
|
||||
__url__ = ("blender", "elysiun")
|
||||
__url__ = ("blender", "blenderartists.org")
|
||||
__version__ = "1.1"
|
||||
|
||||
__bpydoc__ = """\
|
||||
|
@ -10,7 +10,7 @@ Tooltip: 'Export to a SoftImage XSI file'
|
||||
|
||||
__author__ = ("Elira")
|
||||
__url__ = ["Author's site, http://www.creative-realms.net/~elira/blender.html",
|
||||
"SoftImage's site, www.softimage.com", "elysiun"]
|
||||
"SoftImage's site, www.softimage.com", "blenderartists.org"]
|
||||
__email__ = ["scripts"]
|
||||
__version__ = "2005/11/01"
|
||||
|
||||
|
@ -31,6 +31,10 @@
|
||||
#ifndef BKE_VFONT_H
|
||||
#define BKE_VFONT_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <wchar.h>
|
||||
|
||||
struct VFont;
|
||||
@ -65,7 +69,11 @@ int getselection(int *start, int *end);
|
||||
void chtoutf8(unsigned long c, char *o);
|
||||
void wcs2utf8s(char *dst, wchar_t *src);
|
||||
int wcsleninu8(wchar_t *src);
|
||||
int utf8towchar_(wchar_t *w, char *c);
|
||||
int utf8towchar(wchar_t *w, char *c);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -489,9 +489,10 @@ static float get_actionstrip_frame(bActionStrip *strip, float cframe, int invert
|
||||
{
|
||||
float length, actlength, repeat, scale;
|
||||
|
||||
if(strip->repeat == 0.0f) strip->repeat = 1.0f;
|
||||
repeat = (strip->flag & ACTSTRIP_USESTRIDE) ? (1.0f) : (strip->repeat);
|
||||
if(strip->scale == 0.0f) strip->scale= 1.0f;
|
||||
|
||||
if(strip->scale == 0.0f) strip->scale= 1.0f;
|
||||
scale = abs(strip->scale); /* scale must be positive (for now) */
|
||||
|
||||
actlength = strip->actend-strip->actstart;
|
||||
|
@ -330,6 +330,7 @@ static void setup_app_data(BlendFileData *bfd, char *filename)
|
||||
extern void lib_link_screen_restore(Main *, Scene *);
|
||||
|
||||
SWAP(ListBase, G.main->screen, bfd->main->screen);
|
||||
SWAP(ListBase, G.main->script, bfd->main->script);
|
||||
|
||||
/* we re-use current screen */
|
||||
curscreen= G.curscreen;
|
||||
|
@ -639,7 +639,7 @@ void cloth_collision_static ( ModifierData *md1, ModifierData *md2, CollisionTre
|
||||
if ( i < 4 )
|
||||
{
|
||||
// calc distance + normal
|
||||
#if WITH_BULLET == 1
|
||||
#ifdef WITH_BULLET
|
||||
distance = plNearestPoints (
|
||||
verts1[collpair->ap1].txold, verts1[collpair->ap2].txold, verts1[collpair->ap3].txold, collmd->current_x[collpair->bp1].co, collmd->current_x[collpair->bp2].co, collmd->current_x[collpair->bp3].co, collpair->pa,collpair->pb,collpair->vector );
|
||||
#else
|
||||
|
@ -1818,7 +1818,7 @@ static unsigned int flush_layer_node(Scene *sce, DagNode *node, int curtime)
|
||||
}
|
||||
|
||||
/* node was checked to have lasttime != curtime , and is of type ID_OB */
|
||||
static void flush_pointcache_reset(DagNode *node, int curtime)
|
||||
static void flush_pointcache_reset(DagNode *node, int curtime, int reset)
|
||||
{
|
||||
DagAdjList *itA;
|
||||
Object *ob;
|
||||
@ -1829,9 +1829,15 @@ static void flush_pointcache_reset(DagNode *node, int curtime)
|
||||
if(itA->node->type==ID_OB) {
|
||||
if(itA->node->lasttime!=curtime) {
|
||||
ob= (Object*)(node->ob);
|
||||
if(BKE_ptcache_object_reset(ob, PTCACHE_RESET_DEPSGRAPH))
|
||||
ob->recalc |= OB_RECALC_DATA;
|
||||
flush_pointcache_reset(itA->node, curtime);
|
||||
|
||||
if(reset || (ob->recalc & OB_RECALC)) {
|
||||
if(BKE_ptcache_object_reset(ob, PTCACHE_RESET_DEPSGRAPH))
|
||||
ob->recalc |= OB_RECALC_DATA;
|
||||
|
||||
flush_pointcache_reset(itA->node, curtime, 1);
|
||||
}
|
||||
else
|
||||
flush_pointcache_reset(itA->node, curtime, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1877,9 +1883,15 @@ void DAG_scene_flush_update(Scene *sce, unsigned int lay, int time)
|
||||
for(itA = firstnode->child; itA; itA= itA->next) {
|
||||
if(itA->node->lasttime!=lasttime && itA->node->type==ID_OB) {
|
||||
ob= (Object*)(itA->node->ob);
|
||||
if(BKE_ptcache_object_reset(ob, PTCACHE_RESET_DEPSGRAPH))
|
||||
ob->recalc |= OB_RECALC_DATA;
|
||||
flush_pointcache_reset(itA->node, lasttime);
|
||||
|
||||
if(ob->recalc & OB_RECALC) {
|
||||
if(BKE_ptcache_object_reset(ob, PTCACHE_RESET_DEPSGRAPH))
|
||||
ob->recalc |= OB_RECALC_DATA;
|
||||
|
||||
flush_pointcache_reset(itA->node, lasttime, 1);
|
||||
}
|
||||
else
|
||||
flush_pointcache_reset(itA->node, lasttime, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -159,41 +159,61 @@ utf8slen(char *src)
|
||||
return size;
|
||||
}
|
||||
|
||||
int utf8towchar_(wchar_t *w, char *c)
|
||||
|
||||
/* Converts Unicode to wchar
|
||||
|
||||
According to RFC 3629 "UTF-8, a transformation format of ISO 10646"
|
||||
(http://tools.ietf.org/html/rfc3629), the valid UTF-8 encoding are:
|
||||
|
||||
Char. number range | UTF-8 octet sequence
|
||||
(hexadecimal) | (binary)
|
||||
--------------------+---------------------------------------------
|
||||
0000 0000-0000 007F | 0xxxxxxx
|
||||
0000 0080-0000 07FF | 110xxxxx 10xxxxxx
|
||||
0000 0800-0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
|
||||
0001 0000-0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
|
||||
|
||||
If the encoding incidated by the first character is incorrect (because the
|
||||
1 to 3 following characters do not match 10xxxxxx), the output is a '?' and
|
||||
only a single input character is consumed.
|
||||
|
||||
*/
|
||||
|
||||
int utf8towchar(wchar_t *w, char *c)
|
||||
{
|
||||
int len=0;
|
||||
|
||||
if(w==NULL || c==NULL) return(0);
|
||||
//printf("%s\n",c);
|
||||
while(*c)
|
||||
{
|
||||
if(*c & 0x80)
|
||||
{
|
||||
if(*c & 0x40)
|
||||
{
|
||||
if(*c & 0x20)
|
||||
{
|
||||
if(*c & 0x10)
|
||||
{
|
||||
*w=(c[0] & 0x0f)<<18 | (c[1]&0x1f)<<12 | (c[2]&0x3f)<<6 | (c[3]&0x7f);
|
||||
c++;
|
||||
}
|
||||
else
|
||||
*w=(c[0] & 0x1f)<<12 | (c[1]&0x3f)<<6 | (c[2]&0x7f);
|
||||
c++;
|
||||
}
|
||||
else
|
||||
*w=(((c[0] &0x3f)<<6) | (c[1]&0x7f));
|
||||
|
||||
while(*c) {
|
||||
if ((*c & 0xe0) == 0xc0) {
|
||||
if((c[1] & 0x80) && (c[1] & 0x40) == 0x00) {
|
||||
*w=((c[0] &0x1f)<<6) | (c[1]&0x3f);
|
||||
c++;
|
||||
} else {
|
||||
*w = '?';
|
||||
}
|
||||
else
|
||||
*w=(c[0] & 0x7f);
|
||||
} else if ((*c & 0xf0) == 0xe0) {
|
||||
if((c[1] & c[2] & 0x80) && ((c[1] | c[2]) & 0x40) == 0x00) {
|
||||
*w=((c[0] & 0x0f)<<12) | ((c[1]&0x3f)<<6) | (c[2]&0x3f);
|
||||
c += 2;
|
||||
} else {
|
||||
*w = '?';
|
||||
}
|
||||
else
|
||||
*w=(c[0] & 0x7f);
|
||||
c++;
|
||||
w++;
|
||||
len++;
|
||||
}
|
||||
} else if ((*c & 0xf8) == 0xf0) {
|
||||
if((c[1] & c[2] & c[3] & 0x80) && ((c[1] | c[2] | c[3]) & 0x40) == 0x00) {
|
||||
*w=((c[0] & 0x07)<<18) | ((c[1]&0x1f)<<12) | ((c[2]&0x3f)<<6) | (c[3]&0x3f);
|
||||
c += 3;
|
||||
} else {
|
||||
*w = '?';
|
||||
}
|
||||
} else
|
||||
*w=(c[0] & 0x7f);
|
||||
|
||||
c++;
|
||||
w++;
|
||||
len++;
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
@ -641,7 +661,7 @@ struct chartrans *text_to_curve(Object *ob, int mode)
|
||||
utf8len = utf8slen(cu->str);
|
||||
tmp = mem = MEM_callocN(((utf8len + 1) * sizeof(wchar_t)), "convertedmem");
|
||||
|
||||
utf8towchar_(mem, cu->str);
|
||||
utf8towchar(mem, cu->str);
|
||||
|
||||
// Count the wchar_t string length
|
||||
slen = wcslen(mem);
|
||||
|
@ -246,7 +246,6 @@ static void image_free_buffers(Image *ima)
|
||||
/* called by library too, do not free ima itself */
|
||||
void free_image(Image *ima)
|
||||
{
|
||||
|
||||
image_free_buffers(ima);
|
||||
if (ima->packedfile) {
|
||||
freePackedFile(ima->packedfile);
|
||||
@ -257,7 +256,6 @@ void free_image(Image *ima)
|
||||
if (ima->preview) {
|
||||
BKE_previewimg_free(&ima->preview);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* only image block itself */
|
||||
|
@ -5142,11 +5142,14 @@ static void clothModifier_copyData(ModifierData *md, ModifierData *target)
|
||||
if(tclmd->sim_parms)
|
||||
MEM_freeN(tclmd->sim_parms);
|
||||
if(tclmd->coll_parms)
|
||||
MEM_freeN(tclmd->coll_parms);
|
||||
MEM_freeN(tclmd->coll_parms);
|
||||
if(tclmd->point_cache)
|
||||
BKE_ptcache_free(tclmd->point_cache);
|
||||
|
||||
tclmd->sim_parms = MEM_dupallocN(clmd->sim_parms);
|
||||
tclmd->coll_parms = MEM_dupallocN(clmd->coll_parms);
|
||||
tclmd->point_cache = BKE_ptcache_copy(clmd->point_cache);
|
||||
tclmd->clothObject = NULL;
|
||||
}
|
||||
|
||||
static int clothModifier_dependsOnTime(ModifierData *md)
|
||||
|
@ -1372,7 +1372,7 @@ void object_make_proxy(Object *ob, Object *target, Object *gob)
|
||||
ob->mat = MEM_dupallocN(target->mat);
|
||||
for(i=0; i<target->totcol; i++) {
|
||||
/* dont need to run test_object_materials since we know this object is new and not used elsewhere */
|
||||
id_us_plus(ob->mat[i]);
|
||||
id_us_plus((ID *)ob->mat[i]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -177,7 +177,7 @@ static int ptcache_path(PTCacheID *pid, char *filename)
|
||||
|
||||
blendfilename= (lib)? lib->filename: G.sce;
|
||||
|
||||
BLI_split_dirfile(blendfilename, dir, file);
|
||||
BLI_split_dirfile_basic(blendfilename, NULL, file);
|
||||
i = strlen(file);
|
||||
|
||||
/* remove .blend */
|
||||
|
@ -212,7 +212,6 @@ int reopen_text(Text *text)
|
||||
int i, llen, len;
|
||||
unsigned char *buffer;
|
||||
TextLine *tmp;
|
||||
char sdir[FILE_MAXDIR];
|
||||
char sfile[FILE_MAXFILE];
|
||||
char str[FILE_MAXDIR+FILE_MAXFILE];
|
||||
|
||||
@ -220,7 +219,7 @@ int reopen_text(Text *text)
|
||||
|
||||
BLI_strncpy(str, text->name, FILE_MAXDIR+FILE_MAXFILE);
|
||||
BLI_convertstringcode(str, G.sce, G.scene->r.cfra);
|
||||
BLI_split_dirfile(str, sdir, sfile);
|
||||
BLI_split_dirfile_basic(str, NULL, sfile);
|
||||
|
||||
fp= fopen(str, "r");
|
||||
if(fp==NULL) return 0;
|
||||
@ -312,14 +311,13 @@ Text *add_text(char *file)
|
||||
unsigned char *buffer;
|
||||
TextLine *tmp;
|
||||
Text *ta;
|
||||
char sdir[FILE_MAXDIR];
|
||||
char sfile[FILE_MAXFILE];
|
||||
char str[FILE_MAXDIR+FILE_MAXFILE];
|
||||
|
||||
BLI_strncpy(str, file, FILE_MAXDIR+FILE_MAXFILE);
|
||||
if (G.scene) /* can be NULL (bg mode) */
|
||||
BLI_convertstringcode(str, G.sce, G.scene->r.cfra);
|
||||
BLI_split_dirfile(str, sdir, sfile);
|
||||
BLI_split_dirfile_basic(str, NULL, sfile);
|
||||
|
||||
fp= fopen(str, "r");
|
||||
if(fp==NULL) return NULL;
|
||||
@ -1030,7 +1028,8 @@ int txt_find_string(Text *text, char *findstr)
|
||||
|
||||
void txt_cut_sel (Text *text)
|
||||
{
|
||||
txt_copy_clipboard(text);
|
||||
if (!G.background) /* Python uses txt_cut_sel, which it should not, working around for now */
|
||||
txt_copy_clipboard(text);
|
||||
|
||||
txt_delete_sel(text);
|
||||
txt_make_dirty(text);
|
||||
|
@ -631,6 +631,9 @@ void start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty)
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
fmt->audio_codec = ffmpeg_audio_codec;
|
||||
|
||||
if (ffmpeg_type == FFMPEG_DV) {
|
||||
fmt->audio_codec = CODEC_ID_PCM_S16LE;
|
||||
if (ffmpeg_multiplex_audio
|
||||
|
@ -96,6 +96,7 @@ void BLI_make_file_string(const char *relabase, char *string, const char *dir,
|
||||
void BLI_make_exist(char *dir);
|
||||
void BLI_make_existing_file(char *name);
|
||||
void BLI_split_dirfile(char *string, char *dir, char *file);
|
||||
void BLI_split_dirfile_basic(const char *string, char *dir, char *file);
|
||||
void BLI_join_dirfile(char *string, const char *dir, const char *file);
|
||||
int BLI_testextensie(const char *str, const char *ext);
|
||||
void addlisttolist(ListBase *list1, ListBase *list2);
|
||||
|
@ -29,6 +29,12 @@
|
||||
/* Based on ghash, difference is ghash is not a fixed size,
|
||||
* so for BPath we dont need to malloc */
|
||||
|
||||
struct BPathIteratorSeqData {
|
||||
int totseq;
|
||||
int seq;
|
||||
struct Sequence **seqar; /* Sequence */
|
||||
};
|
||||
|
||||
struct BPathIterator {
|
||||
char* path;
|
||||
char* lib;
|
||||
@ -36,17 +42,25 @@ struct BPathIterator {
|
||||
void* data;
|
||||
int len;
|
||||
int type;
|
||||
|
||||
void (*setpath_callback)(struct BPathIterator *, char *);
|
||||
void (*getpath_callback)(struct BPathIterator *, char *);
|
||||
|
||||
/* only for seq data */
|
||||
struct BPathIteratorSeqData seqdata;
|
||||
};
|
||||
|
||||
void BLI_bpathIterator_init (struct BPathIterator *bpi);
|
||||
char* BLI_bpathIterator_getPath (struct BPathIterator *bpi);
|
||||
char* BLI_bpathIterator_getLib (struct BPathIterator *bpi);
|
||||
char* BLI_bpathIterator_getName (struct BPathIterator *bpi);
|
||||
int BLI_bpathIterator_getType (struct BPathIterator *bpi);
|
||||
int BLI_bpathIterator_getPathMaxLen(struct BPathIterator *bpi);
|
||||
void BLI_bpathIterator_step (struct BPathIterator *bpi);
|
||||
int BLI_bpathIterator_isDone (struct BPathIterator *bpi);
|
||||
void BLI_bpathIterator_copyPathExpanded( struct BPathIterator *bpi, char *path_expanded);
|
||||
void BLI_bpathIterator_init (struct BPathIterator *bpi);
|
||||
void BLI_bpathIterator_free (struct BPathIterator *bpi);
|
||||
char* BLI_bpathIterator_getLib (struct BPathIterator *bpi);
|
||||
char* BLI_bpathIterator_getName (struct BPathIterator *bpi);
|
||||
int BLI_bpathIterator_getType (struct BPathIterator *bpi);
|
||||
int BLI_bpathIterator_getPathMaxLen (struct BPathIterator *bpi);
|
||||
void BLI_bpathIterator_step (struct BPathIterator *bpi);
|
||||
int BLI_bpathIterator_isDone (struct BPathIterator *bpi);
|
||||
void BLI_bpathIterator_getPath (struct BPathIterator *bpi, char *path);
|
||||
void BLI_bpathIterator_getPathExpanded (struct BPathIterator *bpi, char *path_expanded);
|
||||
void BLI_bpathIterator_setPath (struct BPathIterator *bpi, char *path);
|
||||
|
||||
/* high level funcs */
|
||||
|
||||
|
@ -28,11 +28,13 @@
|
||||
|
||||
#include "BLI_bpath.h"
|
||||
#include "BKE_global.h"
|
||||
#include "BIF_screen.h" /* only for wait cursor */
|
||||
#include "DNA_ID.h" /* Library */
|
||||
#include "DNA_vfont_types.h"
|
||||
#include "DNA_image_types.h"
|
||||
#include "DNA_sound_types.h"
|
||||
#include "DNA_scene_types.h" /* to get the current frame */
|
||||
#include "DNA_sequence_types.h"
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
@ -41,6 +43,10 @@
|
||||
|
||||
#include "blendef.h"
|
||||
#include "BKE_utildefines.h"
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
/* for sequence */
|
||||
#include "BSE_sequence.h"
|
||||
|
||||
/* for writing to a textblock */
|
||||
#include "BKE_text.h"
|
||||
@ -67,35 +73,60 @@
|
||||
|
||||
#define FILE_MAX 240
|
||||
|
||||
|
||||
/* TODO - BPATH_PLUGIN, BPATH_SEQ */
|
||||
enum BPathTypes {
|
||||
BPATH_IMAGE = 0,
|
||||
BPATH_SOUND,
|
||||
BPATH_FONT,
|
||||
BPATH_LIB,
|
||||
BPATH_SEQ,
|
||||
|
||||
BPATH_DONE
|
||||
};
|
||||
|
||||
|
||||
void BLI_bpathIterator_init( struct BPathIterator *bpi ) {
|
||||
bpi->type = BPATH_IMAGE;
|
||||
bpi->data = NULL;
|
||||
|
||||
bpi->getpath_callback = NULL;
|
||||
bpi->setpath_callback = NULL;
|
||||
|
||||
/* Sequencer spesific */
|
||||
bpi->seqdata.totseq = 0;
|
||||
bpi->seqdata.seq = 0;
|
||||
bpi->seqdata.seqar = NULL;
|
||||
|
||||
BLI_bpathIterator_step(bpi);
|
||||
}
|
||||
|
||||
char* BLI_bpathIterator_getPath( struct BPathIterator *bpi) {
|
||||
return bpi->path;
|
||||
void BLI_bpathIterator_free( struct BPathIterator *bpi ) {
|
||||
if (bpi->seqdata.seqar)
|
||||
MEM_freeN((void *)bpi->seqdata.seqar);
|
||||
bpi->seqdata.seqar = NULL;
|
||||
}
|
||||
void BLI_bpathIterator_copyPathExpanded( struct BPathIterator *bpi, char *path_expanded) {
|
||||
char *filepath, *libpath;
|
||||
|
||||
void BLI_bpathIterator_getPath( struct BPathIterator *bpi, char *path) {
|
||||
if (bpi->getpath_callback) {
|
||||
bpi->getpath_callback( bpi, path );
|
||||
} else {
|
||||
strcpy(path, bpi->path); /* warning, we assume 'path' are long enough */
|
||||
}
|
||||
}
|
||||
|
||||
void BLI_bpathIterator_setPath( struct BPathIterator *bpi, char *path) {
|
||||
if (bpi->setpath_callback) {
|
||||
bpi->setpath_callback( bpi, path );
|
||||
} else {
|
||||
strcpy(bpi->path, path); /* warning, we assume 'path' are long enough */
|
||||
}
|
||||
}
|
||||
|
||||
void BLI_bpathIterator_getPathExpanded( struct BPathIterator *bpi, char *path_expanded) {
|
||||
char *libpath;
|
||||
|
||||
filepath = BLI_bpathIterator_getPath(bpi);
|
||||
BLI_bpathIterator_getPath(bpi, path_expanded);
|
||||
libpath = BLI_bpathIterator_getLib(bpi);
|
||||
|
||||
BLI_strncpy(path_expanded, filepath, FILE_MAXDIR*2);
|
||||
|
||||
if (libpath) { /* check the files location relative to its library path */
|
||||
BLI_convertstringcode(path_expanded, libpath, G.scene->r.cfra);
|
||||
} else { /* local data, use the blend files path */
|
||||
@ -116,7 +147,7 @@ int BLI_bpathIterator_getPathMaxLen( struct BPathIterator *bpi) {
|
||||
}
|
||||
|
||||
/* gets the first or the next image that has a path - not a viewer node or generated image */
|
||||
static struct Image *ima_getpath__internal(struct Image *ima, int step_next) {
|
||||
static struct Image *ima_stepdata__internal(struct Image *ima, int step_next) {
|
||||
if (ima==NULL)
|
||||
return NULL;
|
||||
|
||||
@ -132,7 +163,7 @@ static struct Image *ima_getpath__internal(struct Image *ima, int step_next) {
|
||||
return ima;
|
||||
}
|
||||
|
||||
static struct VFont *vf_getpath__internal(struct VFont *vf, int step_next) {
|
||||
static struct VFont *vf_stepdata__internal(struct VFont *vf, int step_next) {
|
||||
if (vf==NULL)
|
||||
return NULL;
|
||||
|
||||
@ -150,7 +181,7 @@ static struct VFont *vf_getpath__internal(struct VFont *vf, int step_next) {
|
||||
return vf;
|
||||
}
|
||||
|
||||
static struct bSound *snd_getpath__internal(struct bSound *snd, int step_next) {
|
||||
static struct bSound *snd_stepdata__internal(struct bSound *snd, int step_next) {
|
||||
if (snd==NULL)
|
||||
return NULL;
|
||||
|
||||
@ -168,13 +199,97 @@ static struct bSound *snd_getpath__internal(struct bSound *snd, int step_next) {
|
||||
return snd;
|
||||
}
|
||||
|
||||
static struct Sequence *seq_stepdata__internal(struct BPathIterator *bpi, int step_next) {
|
||||
Sequence *seq;
|
||||
|
||||
if (G.scene->ed==NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (bpi->seqdata.seqar == NULL) {
|
||||
/* allocate the sequencer array */
|
||||
build_seqar( &(((Editing *)G.scene->ed)->seqbase), &bpi->seqdata.seqar, &bpi->seqdata.totseq);
|
||||
bpi->seqdata.seq = 0;
|
||||
}
|
||||
|
||||
if (step_next) {
|
||||
bpi->seqdata.seq++;
|
||||
}
|
||||
|
||||
if (bpi->seqdata.seq >= bpi->seqdata.totseq) {
|
||||
seq = NULL;
|
||||
} else {
|
||||
seq = bpi->seqdata.seqar[bpi->seqdata.seq];
|
||||
while (!SEQ_HAS_PATH(seq)) {
|
||||
bpi->seqdata.seq++;
|
||||
if (bpi->seqdata.seq >= bpi->seqdata.totseq) {
|
||||
seq = NULL;
|
||||
break;
|
||||
}
|
||||
seq = bpi->seqdata.seqar[bpi->seqdata.seq];
|
||||
}
|
||||
}
|
||||
return seq ;
|
||||
}
|
||||
|
||||
void seq_getpath(struct BPathIterator *bpi, char *path) {
|
||||
Sequence *seq = (Sequence *)bpi->data;
|
||||
|
||||
|
||||
path[0] = '\0'; /* incase we cant get the path */
|
||||
if (seq==NULL) return;
|
||||
if (SEQ_HAS_PATH(seq)) {
|
||||
if (seq->type == SEQ_IMAGE || seq->type == SEQ_MOVIE) {
|
||||
BLI_strncpy(path, seq->strip->dir, FILE_MAX);
|
||||
BLI_add_slash(path); /* incase its missing */
|
||||
if (seq->strip->stripdata) { /* should always be true! */
|
||||
/* Using the first image is weak for image sequences */
|
||||
strcat(path, seq->strip->stripdata->name);
|
||||
}
|
||||
} else {
|
||||
/* simple case */
|
||||
BLI_strncpy(seq->strip->dir, path, sizeof(seq->strip->dir));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void seq_setpath(struct BPathIterator *bpi, char *path) {
|
||||
Sequence *seq = (Sequence *)bpi->data;
|
||||
if (seq==NULL) return;
|
||||
|
||||
if (SEQ_HAS_PATH(seq)) {
|
||||
if (seq->type == SEQ_IMAGE || seq->type == SEQ_MOVIE) {
|
||||
BLI_split_dirfile_basic(path, seq->strip->dir, seq->strip->stripdata->name);
|
||||
} else {
|
||||
/* simple case */
|
||||
BLI_strncpy(seq->strip->dir, path, sizeof(seq->strip->dir));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void bpi_type_step__internal( struct BPathIterator *bpi) {
|
||||
bpi->type++; /* advance to the next type */
|
||||
bpi->data = NULL;
|
||||
|
||||
switch (bpi->type) {
|
||||
case BPATH_SEQ:
|
||||
bpi->getpath_callback = seq_getpath;
|
||||
bpi->setpath_callback = seq_setpath;
|
||||
break;
|
||||
default:
|
||||
bpi->getpath_callback = NULL;
|
||||
bpi->setpath_callback = NULL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void BLI_bpathIterator_step( struct BPathIterator *bpi) {
|
||||
while (bpi->type != BPATH_DONE) {
|
||||
|
||||
if ((bpi->type) == BPATH_IMAGE) {
|
||||
/*if (bpi->data) bpi->data = ((ID *)bpi->data)->next;*/
|
||||
if (bpi->data) bpi->data = ima_getpath__internal( (Image *)bpi->data, 1 ); /* must skip images that have no path */
|
||||
else bpi->data = ima_getpath__internal(G.main->image.first, 0);
|
||||
if (bpi->data) bpi->data = ima_stepdata__internal( (Image *)bpi->data, 1 ); /* must skip images that have no path */
|
||||
else bpi->data = ima_stepdata__internal(G.main->image.first, 0);
|
||||
|
||||
if (bpi->data) {
|
||||
/* get the path info from this datatype */
|
||||
@ -189,13 +304,13 @@ void BLI_bpathIterator_step( struct BPathIterator *bpi) {
|
||||
break;
|
||||
|
||||
} else {
|
||||
bpi->type+=1; /* advance to the next type */
|
||||
bpi_type_step__internal(bpi);
|
||||
}
|
||||
|
||||
|
||||
} else if ((bpi->type) == BPATH_SOUND) {
|
||||
if (bpi->data) bpi->data = snd_getpath__internal( (bSound *)bpi->data, 1 ); /* must skip images that have no path */
|
||||
else bpi->data = snd_getpath__internal(G.main->sound.first, 0);
|
||||
if (bpi->data) bpi->data = snd_stepdata__internal( (bSound *)bpi->data, 1 ); /* must skip images that have no path */
|
||||
else bpi->data = snd_stepdata__internal(G.main->sound.first, 0);
|
||||
|
||||
if (bpi->data) {
|
||||
/* get the path info from this datatype */
|
||||
@ -209,14 +324,14 @@ void BLI_bpathIterator_step( struct BPathIterator *bpi) {
|
||||
/* we are done, advancing to the next item, this type worked fine */
|
||||
break;
|
||||
} else {
|
||||
bpi->type+=1; /* advance to the next type */
|
||||
bpi_type_step__internal(bpi);
|
||||
}
|
||||
|
||||
|
||||
} else if ((bpi->type) == BPATH_FONT) {
|
||||
|
||||
if (bpi->data) bpi->data = vf_getpath__internal( (VFont *)bpi->data, 1 );
|
||||
else bpi->data = vf_getpath__internal( G.main->vfont.first, 0 );
|
||||
if (bpi->data) bpi->data = vf_stepdata__internal( (VFont *)bpi->data, 1 );
|
||||
else bpi->data = vf_stepdata__internal( G.main->vfont.first, 0 );
|
||||
|
||||
if (bpi->data) {
|
||||
/* get the path info from this datatype */
|
||||
@ -230,12 +345,10 @@ void BLI_bpathIterator_step( struct BPathIterator *bpi) {
|
||||
/* we are done, advancing to the next item, this type worked fine */
|
||||
break;
|
||||
} else {
|
||||
bpi->type+=1; /* advance to the next type */
|
||||
bpi_type_step__internal(bpi);
|
||||
}
|
||||
|
||||
|
||||
} else if ((bpi->type) == BPATH_LIB) {
|
||||
|
||||
if (bpi->data) bpi->data = ((ID *)bpi->data)->next;
|
||||
else bpi->data = G.main->library.first;
|
||||
|
||||
@ -251,7 +364,19 @@ void BLI_bpathIterator_step( struct BPathIterator *bpi) {
|
||||
/* we are done, advancing to the next item, this type worked fine */
|
||||
break;
|
||||
} else {
|
||||
bpi->type+=1; /* advance to the next type */
|
||||
bpi_type_step__internal(bpi);
|
||||
}
|
||||
} else if ((bpi->type) == BPATH_SEQ) {
|
||||
if (bpi->data) bpi->data = seq_stepdata__internal( bpi, 1 );
|
||||
else bpi->data = seq_stepdata__internal( bpi, 0 );
|
||||
if (bpi->data) {
|
||||
Sequence *seq = (Sequence *)bpi->data;
|
||||
bpi->lib = NULL;
|
||||
bpi->name = seq->name+2;
|
||||
bpi->len = sizeof(seq->strip->stripdata->name);
|
||||
break;
|
||||
} else {
|
||||
bpi_type_step__internal(bpi);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -280,6 +405,9 @@ static void bpathToText(Text *btxt, struct BPathIterator *bpi)
|
||||
case BPATH_LIB:
|
||||
txt_insert_buf( btxt, "Library \"" );
|
||||
break;
|
||||
case BPATH_SEQ:
|
||||
txt_insert_buf( btxt, "Sequence \"" );
|
||||
break;
|
||||
default:
|
||||
txt_insert_buf( btxt, "Unknown \"" );
|
||||
break;
|
||||
@ -292,7 +420,7 @@ static void bpathToText(Text *btxt, struct BPathIterator *bpi)
|
||||
}
|
||||
txt_insert_buf( btxt, "\" " );
|
||||
|
||||
BLI_bpathIterator_copyPathExpanded(bpi, path_expanded);
|
||||
BLI_bpathIterator_getPathExpanded(bpi, path_expanded);
|
||||
|
||||
txt_insert_buf( btxt, path_expanded );
|
||||
txt_insert_buf( btxt, "\n" );
|
||||
@ -306,15 +434,14 @@ void checkMissingFiles( char *txtname ) {
|
||||
|
||||
/* be sure there is low chance of the path being too short */
|
||||
char filepath_expanded[FILE_MAXDIR*2];
|
||||
char *filepath, *libpath;
|
||||
char *libpath;
|
||||
int files_missing = 0;
|
||||
|
||||
BLI_bpathIterator_init(&bpi);
|
||||
while (!BLI_bpathIterator_isDone(&bpi)) {
|
||||
filepath = BLI_bpathIterator_getPath(&bpi);
|
||||
libpath = BLI_bpathIterator_getLib(&bpi);
|
||||
|
||||
BLI_bpathIterator_copyPathExpanded( &bpi, filepath_expanded );
|
||||
BLI_bpathIterator_getPathExpanded( &bpi, filepath_expanded );
|
||||
|
||||
if (!BLI_exists(filepath_expanded)) {
|
||||
if (!btxt) {
|
||||
@ -328,12 +455,13 @@ void checkMissingFiles( char *txtname ) {
|
||||
}
|
||||
BLI_bpathIterator_step(&bpi);
|
||||
}
|
||||
BLI_bpathIterator_free(&bpi);
|
||||
}
|
||||
|
||||
/* dont log any errors at the moment, should probably do this */
|
||||
void makeFilesRelative(char *txtname, int *tot, int *changed, int *failed, int *linked) {
|
||||
struct BPathIterator bpi;
|
||||
char *filepath, *libpath;
|
||||
char filepath[FILE_MAX], *libpath;
|
||||
|
||||
/* be sure there is low chance of the path being too short */
|
||||
char filepath_relative[(FILE_MAXDIR * 2) + FILE_MAXFILE];
|
||||
@ -344,7 +472,7 @@ void makeFilesRelative(char *txtname, int *tot, int *changed, int *failed, int *
|
||||
|
||||
BLI_bpathIterator_init(&bpi);
|
||||
while (!BLI_bpathIterator_isDone(&bpi)) {
|
||||
filepath = BLI_bpathIterator_getPath(&bpi);
|
||||
BLI_bpathIterator_getPath(&bpi, filepath);
|
||||
libpath = BLI_bpathIterator_getLib(&bpi);
|
||||
|
||||
if(strncmp(filepath, "//", 2)) {
|
||||
@ -368,7 +496,7 @@ void makeFilesRelative(char *txtname, int *tot, int *changed, int *failed, int *
|
||||
(*failed)++;
|
||||
} else {
|
||||
if(strncmp(filepath_relative, "//", 2)==0) {
|
||||
strcpy(filepath, filepath_relative);
|
||||
BLI_bpathIterator_setPath(&bpi, filepath_relative);
|
||||
(*changed)++;
|
||||
} else {
|
||||
if (!btxt) {
|
||||
@ -386,13 +514,14 @@ void makeFilesRelative(char *txtname, int *tot, int *changed, int *failed, int *
|
||||
BLI_bpathIterator_step(&bpi);
|
||||
(*tot)++;
|
||||
}
|
||||
BLI_bpathIterator_free(&bpi);
|
||||
}
|
||||
|
||||
/* dont log any errors at the moment, should probably do this -
|
||||
* Verry similar to makeFilesRelative - keep in sync! */
|
||||
void makeFilesAbsolute(char *txtname, int *tot, int *changed, int *failed, int *linked) {
|
||||
struct BPathIterator bpi;
|
||||
char *filepath, *libpath;
|
||||
char filepath[FILE_MAX], *libpath;
|
||||
|
||||
/* be sure there is low chance of the path being too short */
|
||||
char filepath_absolute[(FILE_MAXDIR * 2) + FILE_MAXFILE];
|
||||
@ -403,14 +532,14 @@ void makeFilesAbsolute(char *txtname, int *tot, int *changed, int *failed, int *
|
||||
|
||||
BLI_bpathIterator_init(&bpi);
|
||||
while (!BLI_bpathIterator_isDone(&bpi)) {
|
||||
filepath = BLI_bpathIterator_getPath(&bpi);
|
||||
BLI_bpathIterator_getPath(&bpi, filepath);
|
||||
libpath = BLI_bpathIterator_getLib(&bpi);
|
||||
|
||||
if(strncmp(filepath, "//", 2)==0) {
|
||||
if (libpath) { /* cant make absolute if we are library - TODO, LOG THIS */
|
||||
(*linked)++;
|
||||
} else { /* get the expanded path and check it is relative or too long */
|
||||
BLI_bpathIterator_copyPathExpanded( &bpi, filepath_absolute );
|
||||
BLI_bpathIterator_getPathExpanded( &bpi, filepath_absolute );
|
||||
BLI_cleanup_file(G.sce, filepath_absolute); /* fix any /foo/../foo/ */
|
||||
/* to be safe, check the length */
|
||||
if (BLI_bpathIterator_getPathMaxLen(&bpi) <= strlen(filepath_absolute)) {
|
||||
@ -424,7 +553,7 @@ void makeFilesAbsolute(char *txtname, int *tot, int *changed, int *failed, int *
|
||||
(*failed)++;
|
||||
} else {
|
||||
if(strncmp(filepath_absolute, "//", 2)) {
|
||||
strcpy(filepath, filepath_absolute);
|
||||
BLI_bpathIterator_setPath(&bpi, filepath_absolute);
|
||||
(*changed)++;
|
||||
} else {
|
||||
if (!btxt) {
|
||||
@ -442,6 +571,7 @@ void makeFilesAbsolute(char *txtname, int *tot, int *changed, int *failed, int *
|
||||
BLI_bpathIterator_step(&bpi);
|
||||
(*tot)++;
|
||||
}
|
||||
BLI_bpathIterator_free(&bpi);
|
||||
}
|
||||
|
||||
|
||||
@ -505,28 +635,35 @@ void findMissingFiles(char *str) {
|
||||
|
||||
/* be sure there is low chance of the path being too short */
|
||||
char filepath_expanded[FILE_MAXDIR*2];
|
||||
char *filepath, *libpath;
|
||||
char filepath[FILE_MAX], *libpath;
|
||||
int filesize, recur_depth;
|
||||
|
||||
char dirname[FILE_MAX], filename[FILE_MAX], filename_new[FILE_MAX], dummyname[FILE_MAX];
|
||||
|
||||
BLI_split_dirfile(str, dirname, dummyname);
|
||||
waitcursor( 1 );
|
||||
|
||||
BLI_split_dirfile_basic(str, dirname, NULL);
|
||||
|
||||
BLI_bpathIterator_init(&bpi);
|
||||
|
||||
while (!BLI_bpathIterator_isDone(&bpi)) {
|
||||
filepath = BLI_bpathIterator_getPath(&bpi);
|
||||
BLI_bpathIterator_getPath(&bpi, filepath);
|
||||
libpath = BLI_bpathIterator_getLib(&bpi);
|
||||
|
||||
/* Check if esc was pressed because searching files can be slow */
|
||||
if (blender_test_break()) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (libpath==NULL) {
|
||||
|
||||
BLI_bpathIterator_copyPathExpanded( &bpi, filepath_expanded );
|
||||
BLI_bpathIterator_getPathExpanded( &bpi, filepath_expanded );
|
||||
|
||||
if (!BLI_exists(filepath_expanded)) {
|
||||
/* can the dir be opened? */
|
||||
filesize = -1;
|
||||
recur_depth = 0;
|
||||
BLI_split_dirfile(filepath, dummyname, filename); /* the file to find */
|
||||
BLI_split_dirfile_basic(filepath, NULL, filename); /* the file to find */
|
||||
|
||||
findFileRecursive(filename_new, dirname, filename, &filesize, &recur_depth);
|
||||
if (filesize == -1) { /* could not open dir */
|
||||
@ -543,11 +680,14 @@ void findMissingFiles(char *str) {
|
||||
if (G.relbase_valid)
|
||||
BLI_makestringcode(G.sce, filename_new);
|
||||
|
||||
strcpy( BLI_bpathIterator_getPath( &bpi ), filename_new );
|
||||
BLI_bpathIterator_setPath( &bpi, filename_new );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
BLI_bpathIterator_step(&bpi);
|
||||
}
|
||||
BLI_bpathIterator_free(&bpi);
|
||||
|
||||
waitcursor( 0 );
|
||||
}
|
||||
|
@ -1224,10 +1224,10 @@ char *BLI_gethome(void) {
|
||||
}
|
||||
}
|
||||
}
|
||||
/*
|
||||
#if 0
|
||||
ret = getenv("USERPROFILE");
|
||||
if (ret) {
|
||||
if (BLI_exists(ret)) { /* from fop, also below...
|
||||
if (BLI_exists(ret)) { /* from fop, also below... */
|
||||
sprintf(dir, "%s\\Application Data\\Blender Foundation\\Blender", ret);
|
||||
BLI_recurdir_fileops(dir);
|
||||
if (BLI_exists(dir)) {
|
||||
@ -1236,7 +1236,7 @@ char *BLI_gethome(void) {
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
#endif
|
||||
|
||||
/*
|
||||
Saving in the Windows dir is less than desirable.
|
||||
@ -1426,8 +1426,41 @@ int BLI_testextensie(const char *str, const char *ext)
|
||||
return (retval);
|
||||
}
|
||||
|
||||
/*
|
||||
* This is a simple version of BLI_split_dirfile that has the following advantages...
|
||||
*
|
||||
* Converts "/foo/bar.txt" to "/foo/" and "bar.txt"
|
||||
* - wont change 'string'
|
||||
* - wont create any directories
|
||||
* - dosnt use CWD, or deal with relative paths.
|
||||
* - Only fill's in *dir and *file when they are non NULL
|
||||
* */
|
||||
void BLI_split_dirfile_basic(const char *string, char *dir, char *file)
|
||||
{
|
||||
int lslash=0, i = 0;
|
||||
for (i=0; string[i]!='\0'; i++) {
|
||||
if (string[i]=='\\' || string[i]=='/')
|
||||
lslash = i+1;
|
||||
}
|
||||
if (dir) {
|
||||
if (lslash) {
|
||||
BLI_strncpy( dir, string, lslash+1); /* +1 to include the slash and the last char */
|
||||
} else {
|
||||
dir[0] = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
if (file) {
|
||||
strcpy( file, string+lslash);
|
||||
}
|
||||
}
|
||||
|
||||
/* warning, can modify 'string' */
|
||||
|
||||
/* Warning,
|
||||
* - May modify 'string' variable
|
||||
* - May create the directory if it dosnt exist
|
||||
* if this is not needed use BLI_split_dirfile_basic(...)
|
||||
*/
|
||||
void BLI_split_dirfile(char *string, char *dir, char *file)
|
||||
{
|
||||
int a;
|
||||
|
@ -151,7 +151,7 @@ typedef struct ImBuf {
|
||||
int userflags; /**< Used to set imbuf to Dirty and other stuff */
|
||||
int *zbuf; /**< z buffer data, original zbuffer */
|
||||
float *zbuf_float; /**< z buffer data, camera coordinates */
|
||||
void *userdata;
|
||||
void *userdata; /**< temporary storage, only used by baking at the moment */
|
||||
unsigned char *encodedbuffer; /**< Compressed image only used with png currently */
|
||||
unsigned int encodedsize; /**< Size of data written to encodedbuffer */
|
||||
unsigned int encodedbuffersize; /**< Size of encodedbuffer */
|
||||
@ -161,6 +161,7 @@ typedef struct ImBuf {
|
||||
float dither; /**< random dither value, for conversion from float -> byte rect */
|
||||
|
||||
struct MEM_CacheLimiterHandle_s * c_handle; /**< handle for cache limiter */
|
||||
struct ImgInfo * img_info;
|
||||
int refcounter; /**< Refcounter for multiple users */
|
||||
int index; /**< reference index for ImBuf lists */
|
||||
|
||||
|
@ -31,6 +31,7 @@
|
||||
#include <locale.h>
|
||||
#include "libintl.h"
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BKE_font.h"
|
||||
|
||||
#include "../FTF_Settings.h"
|
||||
|
||||
@ -48,49 +49,6 @@
|
||||
|
||||
#define FTF_MAX_STR_SIZE 512
|
||||
|
||||
|
||||
int utf8towchar(wchar_t *w, char *c)
|
||||
{
|
||||
int len=0;
|
||||
if(w==NULL || c==NULL) return(0);
|
||||
//printf("%s\n",c);
|
||||
while(*c)
|
||||
{
|
||||
//Converts Unicode to wchar:
|
||||
|
||||
if(*c & 0x80)
|
||||
{
|
||||
if(*c & 0x40)
|
||||
{
|
||||
if(*c & 0x20)
|
||||
{
|
||||
if(*c & 0x10)
|
||||
{
|
||||
*w=(c[0] & 0x0f)<<18 | (c[1]&0x1f)<<12 | (c[2]&0x3f)<<6 | (c[3]&0x7f);
|
||||
c++;
|
||||
}
|
||||
else
|
||||
*w=(c[0] & 0x1f)<<12 | (c[1]&0x3f)<<6 | (c[2]&0x7f);
|
||||
c++;
|
||||
}
|
||||
else
|
||||
*w=(c[0] &0x3f)<<6 | c[1]&0x7f;
|
||||
c++;
|
||||
}
|
||||
else
|
||||
*w=(c[0] & 0x7f);
|
||||
}
|
||||
else
|
||||
*w=(c[0] & 0x7f);
|
||||
|
||||
c++;
|
||||
w++;
|
||||
len++;
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
|
||||
FTF_TTFont::FTF_TTFont(void)
|
||||
{
|
||||
#ifdef __APPLE__
|
||||
|
@ -229,6 +229,7 @@ static int isqtime (char *name) {
|
||||
#endif
|
||||
|
||||
#ifdef WITH_FFMPEG
|
||||
extern void do_init_ffmpeg();
|
||||
void do_init_ffmpeg()
|
||||
{
|
||||
static int ffmpeg_init = 0;
|
||||
|
@ -92,6 +92,7 @@ void update_changed_seq_and_deps(struct Sequence *seq, int len_change, int ibuf_
|
||||
struct RenderResult;
|
||||
void do_render_seq(struct RenderResult *rr, int cfra);
|
||||
|
||||
#define SEQ_HAS_PATH(seq) (seq->type==SEQ_MOVIE || seq->type==SEQ_HD_SOUND || seq->type==SEQ_RAM_SOUND || seq->type==SEQ_IMAGE)
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -96,6 +96,10 @@
|
||||
|
||||
#define TESTBASE(base) ( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0) )
|
||||
#define TESTBASELIB(base) ( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) && ((base)->object->id.lib==0) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
|
||||
|
||||
/* This is a TESTBASELIB that can work without a 3D view */
|
||||
#define TESTBASELIB_BGMODE(base) ( ((base)->flag & SELECT) && ((base)->lay & (G.vd ? G.vd->lay : G.scene->lay)) && ((base)->object->id.lib==0) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0))
|
||||
|
||||
#define BASE_SELECTABLE(base) ((base->lay & G.vd->lay) && (base->object->restrictflag & (OB_RESTRICT_SELECT|OB_RESTRICT_VIEW))==0)
|
||||
#define FIRSTBASE G.scene->base.first
|
||||
#define LASTBASE G.scene->base.last
|
||||
|
@ -160,11 +160,11 @@ static void node_dynamic_free_storage_cb(bNode *node)
|
||||
}
|
||||
|
||||
/* Disable pynode when its script fails */
|
||||
static void node_dynamic_disable(bNode *node)
|
||||
/*static void node_dynamic_disable(bNode *node)
|
||||
{
|
||||
node->custom1 = 0;
|
||||
node->custom1 = BSET(node->custom1, NODE_DYNAMIC_ERROR);
|
||||
}
|
||||
}*/
|
||||
|
||||
/* Disable all pynodes using the given text (script) id */
|
||||
static void node_dynamic_disable_all_by_id(ID *id)
|
||||
@ -211,6 +211,8 @@ static void node_dynamic_rem_all_links(bNodeType *tinfo)
|
||||
in = tinfo->inputs ? 1 : 0;
|
||||
out = tinfo->outputs ? 1 : 0;
|
||||
|
||||
if (!in && !out) return;
|
||||
|
||||
for (ma= G.main->mat.first; ma; ma= ma->id.next) {
|
||||
if (ma->nodetree) {
|
||||
bNode *nd;
|
||||
@ -248,6 +250,7 @@ static void node_dynamic_reset(bNode *node, int unlink_text)
|
||||
if (nd->typeinfo == tinfo) {
|
||||
node_dynamic_free_storage_cb(nd);
|
||||
node_dynamic_free_sockets(nd);
|
||||
//node_dynamic_update_socket_links(nd, ma->nodetree);
|
||||
nd->typeinfo = tinfo_default;
|
||||
if (unlink_text) {
|
||||
nd->id = NULL;
|
||||
@ -312,17 +315,69 @@ static void node_dynamic_pyerror_print(bNode *node)
|
||||
PyGILState_Release(gilstate);
|
||||
}
|
||||
|
||||
static void node_dynamic_register_type(bNode *node)
|
||||
{
|
||||
nodeRegisterType(&node_all_shaders, node->typeinfo);
|
||||
/* nodeRegisterType copied it to a new one, so we
|
||||
* free the typeinfo itself, but not what it
|
||||
* points to: */
|
||||
MEM_freeN(node->typeinfo);
|
||||
node->typeinfo = node_dynamic_find_typeinfo(&node_all_shaders, node->id);
|
||||
MEM_freeN(node->typeinfo->name);
|
||||
node->typeinfo->name = BLI_strdup(node->name);
|
||||
}
|
||||
|
||||
/* node_dynamic_get_pynode:
|
||||
* Find the pynode definition from the script */
|
||||
static PyObject *node_dynamic_get_pynode(PyObject *dict)
|
||||
{
|
||||
PyObject *key= NULL;
|
||||
Py_ssize_t pos = 0;
|
||||
PyObject *value = NULL;
|
||||
|
||||
/* script writer specified a node? */
|
||||
value = PyDict_GetItemString(dict, "__node__");
|
||||
|
||||
if (value) {
|
||||
if (PyObject_TypeCheck(value, &PyType_Type)) {
|
||||
Py_INCREF(value);
|
||||
return value;
|
||||
}
|
||||
else {
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"expected class object derived from Scripted node");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/* case not, search for it in the script's global dictionary */
|
||||
while (PyDict_Next(dict, &pos, &key, &value)) {
|
||||
/* skip names we know belong to other available objects */
|
||||
if (strcmp("Socket", PyString_AsString(key)) == 0)
|
||||
continue;
|
||||
else if (strcmp("Scripted", PyString_AsString(key)) == 0)
|
||||
continue;
|
||||
/* naive: we grab the first ob of type 'type': */
|
||||
else if (PyObject_TypeCheck(value, &PyType_Type)) {
|
||||
Py_INCREF(value);
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"no PyNode definition found in the script!");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int node_dynamic_parse(struct bNode *node)
|
||||
{
|
||||
PyObject *dict= NULL;
|
||||
PyObject *key= NULL;
|
||||
PyObject *value= NULL;
|
||||
PyObject *pynode_data= NULL;
|
||||
PyObject *pynode= NULL;
|
||||
PyObject *args= NULL;
|
||||
NodeScriptDict *nsd = NULL;
|
||||
PyObject *pyresult = NULL;
|
||||
char *buf = NULL;
|
||||
Py_ssize_t pos = 0;
|
||||
int is_valid_script = 0;
|
||||
PyGILState_STATE gilstate;
|
||||
|
||||
@ -346,7 +401,7 @@ static int node_dynamic_parse(struct bNode *node)
|
||||
MEM_freeN(buf);
|
||||
|
||||
if (!pyresult) {
|
||||
node_dynamic_disable(node);
|
||||
node_dynamic_disable_all_by_id(node->id);
|
||||
node_dynamic_pyerror_print(node);
|
||||
PyGILState_Release(gilstate);
|
||||
return -1;
|
||||
@ -354,58 +409,46 @@ static int node_dynamic_parse(struct bNode *node)
|
||||
|
||||
Py_DECREF(pyresult);
|
||||
|
||||
while (PyDict_Next( (PyObject *)(nsd->dict), &pos, &key, &value)) {
|
||||
/* look for the node object */
|
||||
if (strcmp("Socket", PyString_AsString(key)) == 0)
|
||||
continue; /* XXX ugly, fix it */
|
||||
if (PyObject_TypeCheck(value, &PyType_Type)==1) {
|
||||
BPy_NodeSocketLists *socklists = Node_CreateSocketLists(node);
|
||||
pynode_data = node_dynamic_get_pynode(dict);
|
||||
|
||||
args = Py_BuildValue("(O)", socklists);
|
||||
if (pynode_data) {
|
||||
BPy_NodeSocketLists *socklists = Node_CreateSocketLists(node);
|
||||
|
||||
/* init it to get the input and output sockets */
|
||||
pynode = PyObject_Call(value, args, NULL);
|
||||
args = Py_BuildValue("(O)", socklists);
|
||||
|
||||
Py_DECREF(socklists);
|
||||
Py_DECREF(args);
|
||||
/* init it to get the input and output sockets */
|
||||
pynode = PyObject_Call(pynode_data, args, NULL);
|
||||
|
||||
if (!PyErr_Occurred() && pynode && pytype_is_pynode(pynode)) {
|
||||
InitNode((BPy_Node *)(pynode), node);
|
||||
nsd->node = pynode;
|
||||
node->typeinfo->execfunc = node_dynamic_exec_cb;
|
||||
is_valid_script = 1;
|
||||
Py_DECREF(pynode_data);
|
||||
Py_DECREF(socklists);
|
||||
Py_DECREF(args);
|
||||
|
||||
/* for NEW, LOADED, REPARSE */
|
||||
if (BNTST(node->custom1, NODE_DYNAMIC_ADDEXIST)) {
|
||||
node->typeinfo->pydict = dict;
|
||||
node->typeinfo->pynode = pynode;
|
||||
node->typeinfo->id = node->id;
|
||||
if (BNTST(node->custom1, NODE_DYNAMIC_LOADED))
|
||||
nodeAddSockets(node, node->typeinfo);
|
||||
if (BNTST(node->custom1, NODE_DYNAMIC_REPARSE)) {
|
||||
nodeRegisterType(&node_all_shaders, node->typeinfo);
|
||||
/* nodeRegisterType copied it to a new one, so we
|
||||
* free the typeinfo itself, but not what it
|
||||
* points to: */
|
||||
MEM_freeN(node->typeinfo);
|
||||
node->typeinfo = node_dynamic_find_typeinfo(&node_all_shaders, node->id);
|
||||
MEM_freeN(node->typeinfo->name);
|
||||
node->typeinfo->name = BLI_strdup(node->name);
|
||||
}
|
||||
}
|
||||
if (!PyErr_Occurred() && pynode && pytype_is_pynode(pynode)) {
|
||||
InitNode((BPy_Node *)(pynode), node);
|
||||
nsd->node = pynode;
|
||||
node->typeinfo->execfunc = node_dynamic_exec_cb;
|
||||
is_valid_script = 1;
|
||||
|
||||
node->custom1 = 0;
|
||||
node->custom1 = BSET(node->custom1, NODE_DYNAMIC_READY);
|
||||
break;
|
||||
/* for NEW, LOADED, REPARSE */
|
||||
if (BNTST(node->custom1, NODE_DYNAMIC_ADDEXIST)) {
|
||||
node->typeinfo->pydict = dict;
|
||||
node->typeinfo->pynode = pynode;
|
||||
node->typeinfo->id = node->id;
|
||||
if (BNTST(node->custom1, NODE_DYNAMIC_LOADED))
|
||||
nodeAddSockets(node, node->typeinfo);
|
||||
if (BNTST(node->custom1, NODE_DYNAMIC_REPARSE))
|
||||
node_dynamic_register_type(node);
|
||||
}
|
||||
//break;
|
||||
|
||||
node->custom1 = 0;
|
||||
node->custom1 = BSET(node->custom1, NODE_DYNAMIC_READY);
|
||||
}
|
||||
}
|
||||
|
||||
PyGILState_Release(gilstate);
|
||||
|
||||
if (!is_valid_script) { /* not a valid pynode script */
|
||||
node_dynamic_disable(node);
|
||||
node_dynamic_disable_all_by_id(node->id);
|
||||
node_dynamic_pyerror_print(node);
|
||||
return -1;
|
||||
}
|
||||
@ -470,6 +513,7 @@ static void node_dynamic_setup(bNode *node)
|
||||
else { nodeMakeDynamicType(node); }
|
||||
|
||||
} else {
|
||||
node_dynamic_rem_all_links(node->typeinfo);
|
||||
node_dynamic_free_typeinfo_sockets(node->typeinfo);
|
||||
node_dynamic_update_socket_links(node, NULL);
|
||||
node_dynamic_free_storage_cb(node);
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user