forked from bartvdbraak/blender
svn merge -r 16369:16454 https://svn.blender.org/svnroot/bf-blender/trunk/blender
This commit is contained in:
Daniel Genrich
commit
190aae27ae
@ -39,7 +39,9 @@ ENDMACRO(BLENDERLIB)
|
||||
|
||||
MACRO(SETUP_LIBDIRS)
|
||||
# see "cmake --help-policy CMP0003"
|
||||
CMAKE_POLICY(SET CMP0003 NEW)
|
||||
if(COMMAND cmake_policy)
|
||||
CMAKE_POLICY(SET CMP0003 NEW)
|
||||
endif(COMMAND cmake_policy)
|
||||
LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
|
||||
IF(WITH_INTERNATIONAL)
|
||||
LINK_DIRECTORIES(${GETTEXT_LIBPATH})
|
||||
|
||||
@ -64,6 +64,7 @@ OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
|
||||
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
|
||||
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
|
||||
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
|
||||
OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Mozilla-Unix only)" OFF)
|
||||
|
||||
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
|
||||
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
|
||||
@ -456,6 +457,13 @@ SUBDIRS(
|
||||
# Blender Application
|
||||
SUBDIRS(source/creator)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Blender WebPlugin
|
||||
IF(WITH_WEBPLUGIN)
|
||||
SET(MOZILLA_DIR "${CMAKE_SOURCE_DIR}/../gecko-sdk/" CACHE PATH "Gecko SDK path")
|
||||
SET(WITH_PLAYER ON)
|
||||
ENDIF(WITH_WEBPLUGIN)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Blender Player
|
||||
IF(WITH_PLAYER)
|
||||
|
||||
@ -224,13 +224,15 @@ public:
|
||||
* @param state The state of the window when opened.
|
||||
* @param type The type of drawing context installed in this window.
|
||||
* @param stereoVisual Create a stereo visual for quad buffered stereo.
|
||||
* @param parentWindow Parent (embedder) window
|
||||
* @return The new window (or 0 if creation failed).
|
||||
*/
|
||||
virtual GHOST_IWindow* createWindow(
|
||||
const STR_String& title,
|
||||
GHOST_TInt32 left, GHOST_TInt32 top, GHOST_TUns32 width, GHOST_TUns32 height,
|
||||
GHOST_TWindowState state, GHOST_TDrawingContextType type,
|
||||
const bool stereoVisual) = 0;
|
||||
const bool stereoVisual,
|
||||
const GHOST_TEmbedderWindowID parentWindow = 0) = 0;
|
||||
|
||||
/**
|
||||
* Dispose a window.
|
||||
|
||||
@ -100,6 +100,7 @@ typedef enum {
|
||||
GHOST_kWindowStateMaximized,
|
||||
GHOST_kWindowStateMinimized,
|
||||
GHOST_kWindowStateFullScreen,
|
||||
GHOST_kWindowStateEmbedded,
|
||||
GHOST_kWindowState8Normal = 8,
|
||||
GHOST_kWindowState8Maximized,
|
||||
GHOST_kWindowState8Minimized,
|
||||
@ -392,6 +393,15 @@ typedef struct {
|
||||
} GHOST_DisplaySetting;
|
||||
|
||||
|
||||
#ifdef _WIN32
|
||||
typedef long GHOST_TEmbedderWindowID;
|
||||
#endif // _WIN32
|
||||
|
||||
#ifndef _WIN32
|
||||
// I can't use "Window" from "<X11/Xlib.h>" because it conflits with Window defined in winlay.h
|
||||
typedef int GHOST_TEmbedderWindowID;
|
||||
#endif // _WIN32
|
||||
|
||||
/**
|
||||
* A timer task callback routine.
|
||||
* @param task The timer task object.
|
||||
|
||||
@ -402,7 +402,8 @@ GHOST_IWindow* GHOST_SystemCarbon::createWindow(
|
||||
GHOST_TUns32 height,
|
||||
GHOST_TWindowState state,
|
||||
GHOST_TDrawingContextType type,
|
||||
bool stereoVisual
|
||||
bool stereoVisual,
|
||||
const GHOST_TEmbedderWindowID parentWindow
|
||||
)
|
||||
{
|
||||
GHOST_IWindow* window = 0;
|
||||
|
||||
@ -103,6 +103,7 @@ public:
|
||||
* @param height The height the window.
|
||||
* @param state The state of the window when opened.
|
||||
* @param type The type of drawing context installed in this window.
|
||||
* @param parentWindow Parent (embedder) window
|
||||
* @return The new window (or 0 if creation failed).
|
||||
*/
|
||||
virtual GHOST_IWindow* createWindow(
|
||||
@ -113,7 +114,8 @@ public:
|
||||
GHOST_TUns32 height,
|
||||
GHOST_TWindowState state,
|
||||
GHOST_TDrawingContextType type,
|
||||
const bool stereoVisual
|
||||
const bool stereoVisual,
|
||||
const GHOST_TEmbedderWindowID parentWindow = 0
|
||||
);
|
||||
|
||||
/***************************************************************************************
|
||||
|
||||
@ -169,7 +169,7 @@ GHOST_IWindow* GHOST_SystemWin32::createWindow(
|
||||
const STR_String& title,
|
||||
GHOST_TInt32 left, GHOST_TInt32 top, GHOST_TUns32 width, GHOST_TUns32 height,
|
||||
GHOST_TWindowState state, GHOST_TDrawingContextType type,
|
||||
bool stereoVisual)
|
||||
bool stereoVisual, const GHOST_TEmbedderWindowID parentWindow )
|
||||
{
|
||||
GHOST_Window* window = 0;
|
||||
window = new GHOST_WindowWin32 (title, left, top, width, height, state, type, stereoVisual);
|
||||
|
||||
@ -109,13 +109,14 @@ public:
|
||||
* @param height The height the window.
|
||||
* @param state The state of the window when opened.
|
||||
* @param type The type of drawing context installed in this window.
|
||||
* @param parentWindow Parent (embedder) window
|
||||
* @return The new window (or 0 if creation failed).
|
||||
*/
|
||||
virtual GHOST_IWindow* createWindow(
|
||||
const STR_String& title,
|
||||
GHOST_TInt32 left, GHOST_TInt32 top, GHOST_TUns32 width, GHOST_TUns32 height,
|
||||
GHOST_TWindowState state, GHOST_TDrawingContextType type,
|
||||
const bool stereoVisual);
|
||||
const bool stereoVisual, const GHOST_TEmbedderWindowID parentWindow = 0 );
|
||||
|
||||
/***************************************************************************************
|
||||
** Event management functionality
|
||||
|
||||
@ -191,6 +191,7 @@ getMainDisplayDimensions(
|
||||
* @param height The height the window.
|
||||
* @param state The state of the window when opened.
|
||||
* @param type The type of drawing context installed in this window.
|
||||
* @param parentWindow Parent (embedder) window
|
||||
* @return The new window (or 0 if creation failed).
|
||||
*/
|
||||
GHOST_IWindow*
|
||||
@ -203,14 +204,18 @@ createWindow(
|
||||
GHOST_TUns32 height,
|
||||
GHOST_TWindowState state,
|
||||
GHOST_TDrawingContextType type,
|
||||
bool stereoVisual
|
||||
bool stereoVisual,
|
||||
const GHOST_TEmbedderWindowID parentWindow
|
||||
){
|
||||
GHOST_WindowX11 * window = 0;
|
||||
|
||||
if (!m_display) return 0;
|
||||
|
||||
|
||||
|
||||
|
||||
window = new GHOST_WindowX11 (
|
||||
this,m_display,title, left, top, width, height, state, type, stereoVisual
|
||||
this,m_display,title, left, top, width, height, state, parentWindow, type, stereoVisual
|
||||
);
|
||||
|
||||
if (window) {
|
||||
@ -511,7 +516,9 @@ GHOST_SystemX11::processEvent(XEvent *xe)
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
case DestroyNotify:
|
||||
::exit(-1);
|
||||
// We're not interested in the following things.(yet...)
|
||||
case NoExpose :
|
||||
case GraphicsExpose :
|
||||
|
||||
@ -108,6 +108,7 @@ public:
|
||||
* @param state The state of the window when opened.
|
||||
* @param type The type of drawing context installed in this window.
|
||||
* @param stereoVisual Create a stereo visual for quad buffered stereo.
|
||||
* @param parentWindow Parent (embedder) window
|
||||
* @return The new window (or 0 if creation failed).
|
||||
*/
|
||||
GHOST_IWindow*
|
||||
@ -119,9 +120,10 @@ public:
|
||||
GHOST_TUns32 height,
|
||||
GHOST_TWindowState state,
|
||||
GHOST_TDrawingContextType type,
|
||||
const bool stereoVisual
|
||||
const bool stereoVisual,
|
||||
const GHOST_TEmbedderWindowID parentWindow = 0
|
||||
);
|
||||
|
||||
|
||||
/**
|
||||
* @section Interface Inherited from GHOST_ISystem
|
||||
*/
|
||||
|
||||
@ -437,7 +437,13 @@ GHOST_TSuccess GHOST_WindowWin32::swapBuffers()
|
||||
// adding a glFinish() here is to prevent Geforce in 'full scene antialias' mode
|
||||
// from antialising the Blender window. Officially a swapbuffers does a glFinish
|
||||
// itself, so this feels really like a hack... but it won't harm. (ton)
|
||||
glFinish();
|
||||
//
|
||||
// disabled this because it is a performance killer for the game engine, glFinish
|
||||
// forces synchronization with the graphics card and calling it is strongly
|
||||
// discouraged for good performance. (brecht)
|
||||
//
|
||||
// glFinish();
|
||||
|
||||
return ::SwapBuffers(m_hDC) == TRUE ? GHOST_kSuccess : GHOST_kFailure;
|
||||
}
|
||||
|
||||
|
||||
@ -138,6 +138,7 @@ GHOST_WindowX11(
|
||||
GHOST_TUns32 width,
|
||||
GHOST_TUns32 height,
|
||||
GHOST_TWindowState state,
|
||||
const GHOST_TEmbedderWindowID parentWindow,
|
||||
GHOST_TDrawingContextType type,
|
||||
const bool stereoVisual
|
||||
) :
|
||||
@ -205,21 +206,57 @@ GHOST_WindowX11(
|
||||
|
||||
// create the window!
|
||||
|
||||
m_window =
|
||||
XCreateWindow(
|
||||
m_display,
|
||||
RootWindow(m_display, m_visual->screen),
|
||||
left,
|
||||
top,
|
||||
width,
|
||||
height,
|
||||
0, // no border.
|
||||
m_visual->depth,
|
||||
InputOutput,
|
||||
m_visual->visual,
|
||||
CWBorderPixel|CWColormap|CWEventMask,
|
||||
&xattributes
|
||||
);
|
||||
;
|
||||
if (parentWindow == 0) {
|
||||
m_window =
|
||||
XCreateWindow(
|
||||
m_display,
|
||||
RootWindow(m_display, m_visual->screen),
|
||||
left,
|
||||
top,
|
||||
width,
|
||||
height,
|
||||
0, // no border.
|
||||
m_visual->depth,
|
||||
InputOutput,
|
||||
m_visual->visual,
|
||||
CWBorderPixel|CWColormap|CWEventMask,
|
||||
&xattributes
|
||||
);
|
||||
} else {
|
||||
|
||||
Window root_return;
|
||||
int x_return,y_return;
|
||||
unsigned int w_return,h_return,border_w_return,depth_return;
|
||||
GHOST_TInt32 screen_x, screen_y;
|
||||
|
||||
XGetGeometry(m_display, parentWindow, &root_return, &x_return, &y_return,
|
||||
&w_return, &h_return, &border_w_return, &depth_return );
|
||||
|
||||
left = 0;
|
||||
top = 0;
|
||||
width = w_return;
|
||||
height = h_return;
|
||||
|
||||
|
||||
m_window = XCreateWindow(
|
||||
m_display,
|
||||
parentWindow, // reparent against embedder
|
||||
left,
|
||||
top,
|
||||
width,
|
||||
height,
|
||||
0, // no border.
|
||||
m_visual->depth,
|
||||
InputOutput,
|
||||
m_visual->visual,
|
||||
CWBorderPixel|CWColormap|CWEventMask,
|
||||
&xattributes
|
||||
);
|
||||
|
||||
XSelectInput(m_display , parentWindow, SubstructureNotifyMask);
|
||||
|
||||
}
|
||||
|
||||
|
||||
// Are we in fullscreen mode - then include
|
||||
|
||||
@ -64,6 +64,7 @@ public:
|
||||
* @param width The width the window.
|
||||
* @param height The height the window.
|
||||
* @param state The state the window is initially opened with.
|
||||
* @param parentWindow Parent (embedder) window
|
||||
* @param type The type of drawing context installed in this window.
|
||||
* @param stereoVisual Stereo visual for quad buffered stereo.
|
||||
*/
|
||||
@ -76,6 +77,7 @@ public:
|
||||
GHOST_TUns32 width,
|
||||
GHOST_TUns32 height,
|
||||
GHOST_TWindowState state,
|
||||
const GHOST_TEmbedderWindowID parentWindow,
|
||||
GHOST_TDrawingContextType type = GHOST_kDrawingContextTypeNone,
|
||||
const bool stereoVisual = false
|
||||
);
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<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;..\..\..\..\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"
|
||||
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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG,WIN32,_LIB;WITH_FFMPEG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -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;..\..\..\..\lib\windows\ffmpeg\include"
|
||||
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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
@ -129,7 +129,7 @@
|
||||
<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;..\..\..\..\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"
|
||||
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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG,WIN32,_LIB;WITH_FFMPEG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -183,7 +183,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;..\..\..\..\lib\windows\ffmpeg\include"
|
||||
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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
||||
@ -14,6 +14,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blender", "blender.vcproj",
|
||||
{0A73055E-4DED-40CD-9F72-9093ED3EEC7E} = {0A73055E-4DED-40CD-9F72-9093ED3EEC7E}
|
||||
{09222F5E-1625-4FF3-A89A-384D16875EE5} = {09222F5E-1625-4FF3-A89A-384D16875EE5}
|
||||
{E013786A-9575-4F34-81B2-33290357EE87} = {E013786A-9575-4F34-81B2-33290357EE87}
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067} = {138DD16C-CC78-4F6C-A898-C8DA68D89067}
|
||||
{415BFD6E-64CF-422B-AF88-C07F040A7292} = {415BFD6E-64CF-422B-AF88-C07F040A7292}
|
||||
{106AE171-0083-41D6-A949-20DB0E8DC251} = {106AE171-0083-41D6-A949-20DB0E8DC251}
|
||||
{4C3AB78A-52CA-4276-A041-39776E52D8C8} = {4C3AB78A-52CA-4276-A041-39776E52D8C8}
|
||||
@ -141,6 +142,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GP_ghost", "..\gameengine\g
|
||||
{0A73055E-4DED-40CD-9F72-9093ED3EEC7E} = {0A73055E-4DED-40CD-9F72-9093ED3EEC7E}
|
||||
{09222F5E-1625-4FF3-A89A-384D16875EE5} = {09222F5E-1625-4FF3-A89A-384D16875EE5}
|
||||
{E013786A-9575-4F34-81B2-33290357EE87} = {E013786A-9575-4F34-81B2-33290357EE87}
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067} = {138DD16C-CC78-4F6C-A898-C8DA68D89067}
|
||||
{415BFD6E-64CF-422B-AF88-C07F040A7292} = {415BFD6E-64CF-422B-AF88-C07F040A7292}
|
||||
{4C3AB78A-52CA-4276-A041-39776E52D8C8} = {4C3AB78A-52CA-4276-A041-39776E52D8C8}
|
||||
{6B801390-5F95-4F07-81A7-97FBA046AACC} = {6B801390-5F95-4F07-81A7-97FBA046AACC}
|
||||
@ -238,6 +240,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BL_nodes", "nodes\nodes.vcp
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BL_gpu", "gpu\BL_gpu.vcproj", "{138DD16C-CC78-4F6C-A898-C8DA68D89067}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfiguration) = preSolution
|
||||
3D Plugin Debug = 3D Plugin Debug
|
||||
@ -810,6 +816,22 @@ Global
|
||||
{4C3AB78A-52CA-4276-A041-39776E52D8C8}.Debug.Build.0 = Blender Debug|Win32
|
||||
{4C3AB78A-52CA-4276-A041-39776E52D8C8}.Release.ActiveCfg = Blender Release|Win32
|
||||
{4C3AB78A-52CA-4276-A041-39776E52D8C8}.Release.Build.0 = Blender Release|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.3D Plugin Release.Build.0 = 3D Plugin Release|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.Blender Debug.ActiveCfg = Blender Debug|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.Blender Debug.Build.0 = Blender Debug|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.Blender Release.ActiveCfg = Blender Release|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.Blender Release.Build.0 = Blender Release|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.BlenderPlayer Debug.ActiveCfg = BlenderPlayer Debug|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.BlenderPlayer Debug.Build.0 = BlenderPlayer Debug|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.BlenderPlayer Release.ActiveCfg = BlenderPlayer Release|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.BlenderPlayer Release.Build.0 = BlenderPlayer Release|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.Debug.ActiveCfg = BlenderPlayer Debug|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.Debug.Build.0 = BlenderPlayer Debug|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.Release.ActiveCfg = BlenderPlayer Release|Win32
|
||||
{138DD16C-CC78-4F6C-A898-C8DA68D89067}.Release.Build.0 = BlenderPlayer Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
EndGlobalSection
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\source\blender;..\..\source\blender\imbuf;..\..\source\blender\misc;..\..\source\blender\blenlib;..\..\source\blender\python;..\..\source\blender\include;..\..\source\blender\renderui;..\..\source\blender\makesdna;..\..\source\blender\blenkernel;..\..\source\blender\blenloader;..\..\source\blender\renderconverter;..\..\source\blender\render\extern\include;..\..\source\blender\radiosity\extern\include;..\..\source\kernel\gen_system;..\..\source\kernel\gen_messaging"
|
||||
AdditionalIncludeDirectories="..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\source\blender;..\..\source\blender\imbuf;..\..\source\blender\misc;..\..\source\blender\blenlib;..\..\source\blender\python;..\..\source\blender\include;..\..\source\blender\renderui;..\..\source\blender\makesdna;..\..\source\blender\blenkernel;..\..\source\blender\blenloader;..\..\source\blender\renderconverter;..\..\source\blender\render\extern\include;..\..\source\blender\radiosity\extern\include;..\..\source\kernel\gen_system;..\..\source\kernel\gen_messaging;..\..\..\build\msvc_7\extern\glew\include;..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;WITH_QUICKTIME;GAMEBLENDER=1;USE_SUMO_SOLID;FTGL_LIBRARY_STATIC;WITH_VERSE"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
@ -105,7 +105,7 @@ ECHO Done
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\source\blender;..\..\source\blender\imbuf;..\..\source\blender\misc;..\..\source\blender\blenlib;..\..\source\blender\python;..\..\source\blender\include;..\..\source\blender\renderui;..\..\source\blender\makesdna;..\..\source\blender\blenkernel;..\..\source\blender\blenloader;..\..\source\blender\renderconverter;..\..\source\blender\render\extern\include;..\..\source\blender\radiosity\extern\include;..\..\source\kernel\gen_system;..\..\source\kernel\gen_messaging"
|
||||
AdditionalIncludeDirectories="..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\source\blender;..\..\source\blender\imbuf;..\..\source\blender\misc;..\..\source\blender\blenlib;..\..\source\blender\python;..\..\source\blender\include;..\..\source\blender\renderui;..\..\source\blender\makesdna;..\..\source\blender\blenkernel;..\..\source\blender\blenloader;..\..\source\blender\renderconverter;..\..\source\blender\render\extern\include;..\..\source\blender\radiosity\extern\include;..\..\source\kernel\gen_system;..\..\source\kernel\gen_messaging;..\..\..\build\msvc_7\extern\glew\include;..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;WITH_QUICKTIME;WITH_VERSE"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\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"
|
||||
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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -73,7 +73,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
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"
|
||||
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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET = 1;WITH_FFMPEG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -125,7 +125,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="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"
|
||||
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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2;UNWRAPPER;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET=1;WITH_FFMPEG"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
@ -177,7 +177,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\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"
|
||||
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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="2"
|
||||
@ -229,7 +229,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
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"
|
||||
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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2;WITH_FFMPEG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -281,7 +281,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
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"
|
||||
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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2;UNWRAPPER;WITH_FFMPEG"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
||||
372
projectfiles_vc7/blender/gpu/BL_gpu.vcproj
Normal file
372
projectfiles_vc7/blender/gpu/BL_gpu.vcproj
Normal file
@ -0,0 +1,372 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="BL_gpu"
|
||||
ProjectGUID="{138DD16C-CC78-4F6C-A898-C8DA68D89067}"
|
||||
RootNamespace="BL_gpu"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
</Platforms>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="3D Plugin Debug|Win32"
|
||||
OutputDirectory="..\..\..\..\build\msvc_7\source\blender\gpu\mtdll\debug"
|
||||
IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\gpu\mtdll\debug"
|
||||
ConfigurationType="4"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
DefaultCharIsUnsigned="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\gpu\mtdll\debug\BL_gpu.pch"
|
||||
AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\gpu\mtdll\debug\"
|
||||
ObjectFile="..\..\..\..\build\msvc_7\source\blender\gpu\mtdll\debug\"
|
||||
ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\gpu\mtdll\debug\"
|
||||
WarningLevel="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="..\..\..\..\build\msvc_7\libs\mtdll\debug\BL_gpu.lib"
|
||||
SuppressStartupBanner="TRUE"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Blender Debug|Win32"
|
||||
OutputDirectory="..\..\..\..\build\msvc_7\source\blender\gpu\debug"
|
||||
IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\gpu\debug"
|
||||
ConfigurationType="4"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
DefaultCharIsUnsigned="FALSE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\gpu\debug\BL_gpu.pch"
|
||||
AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\gpu\debug\"
|
||||
ObjectFile="..\..\..\..\build\msvc_7\source\blender\gpu\debug\"
|
||||
ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\gpu\debug\"
|
||||
WarningLevel="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="..\..\..\..\build\msvc_7\libs\debug\BL_gpu.lib"
|
||||
SuppressStartupBanner="TRUE"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Blender Release|Win32"
|
||||
OutputDirectory="..\..\..\..\build\msvc_7\source\blender\gpu"
|
||||
IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\gpu"
|
||||
ConfigurationType="4"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
DefaultCharIsUnsigned="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\gpu\BL_gpu.pch"
|
||||
AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\gpu\"
|
||||
ObjectFile="..\..\..\..\build\msvc_7\source\blender\gpu\"
|
||||
ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\gpu\"
|
||||
WarningLevel="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="..\..\..\..\build\msvc_7\libs\BL_gpu.lib"
|
||||
SuppressStartupBanner="TRUE"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="3D Plugin Release|Win32"
|
||||
OutputDirectory="..\..\..\..\build\msvc_7\source\blender\gpu\mtdll"
|
||||
IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\gpu\mtdll"
|
||||
ConfigurationType="4"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
DefaultCharIsUnsigned="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\gpu\mtdll\BL_gpu.pch"
|
||||
AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\gpu\mtdll\"
|
||||
ObjectFile="..\..\..\..\build\msvc_7\source\blender\gpu\mtdll\"
|
||||
ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\gpu\mtdll\"
|
||||
WarningLevel="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="..\..\..\..\build\msvc_7\libs\mtdll\BL_gpu.lib"
|
||||
SuppressStartupBanner="TRUE"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="BlenderPlayer Debug|Win32"
|
||||
OutputDirectory="..\..\..\..\build\msvc_7\source\blender\gpu\debug\blenplayer"
|
||||
IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\gpu\debug\blenplayer"
|
||||
ConfigurationType="4"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
DefaultCharIsUnsigned="FALSE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\gpu\debug\BL_gpu.pch"
|
||||
AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\gpu\debug\"
|
||||
ObjectFile="..\..\..\..\build\msvc_7\source\blender\gpu\debug\"
|
||||
ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\gpu\debug\"
|
||||
WarningLevel="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
DebugInformationFormat="3"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="..\..\..\..\build\msvc_7\libs\debug\BL_gpu.lib"
|
||||
SuppressStartupBanner="TRUE"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="BlenderPlayer Release|Win32"
|
||||
OutputDirectory="..\..\..\..\build\msvc_7\source\blender\gpu\blenplayer"
|
||||
IntermediateDirectory="..\..\..\..\build\msvc_7\source\blender\gpu\blenplayer"
|
||||
ConfigurationType="4"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="FALSE"
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,DWORDS_LITTLEENDIAN"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
DefaultCharIsUnsigned="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\gpu\BL_gpu.pch"
|
||||
AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\gpu\"
|
||||
ObjectFile="..\..\..\..\build\msvc_7\source\blender\gpu\"
|
||||
ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\gpu\"
|
||||
WarningLevel="2"
|
||||
SuppressStartupBanner="TRUE"
|
||||
CompileAs="0"/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
<Tool
|
||||
Name="VCLibrarianTool"
|
||||
OutputFile="..\..\..\..\build\msvc_7\libs\BL_gpu.lib"
|
||||
SuppressStartupBanner="TRUE"/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
<Files>
|
||||
<Filter
|
||||
Name="Source Files"
|
||||
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
|
||||
<File
|
||||
RelativePath="..\..\..\source\blender\gpu\intern\gpu_codegen.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\source\blender\gpu\intern\gpu_draw.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\source\blender\gpu\intern\gpu_extensions.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\source\blender\gpu\intern\gpu_material.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\source\blender\gpu\intern\gpu_shader_material.glsl.c">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\source\blender\gpu\intern\gpu_shader_vertex.glsl.c">
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Header Files"
|
||||
Filter="h;hpp;hxx;hm;inl">
|
||||
<File
|
||||
RelativePath="..\..\..\source\blender\gpu\intern\gpu_codegen.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\source\blender\gpu\GPU_draw.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\source\blender\gpu\GPU_extensions.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\source\blender\gpu\GPU_material.h">
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
</Globals>
|
||||
</VisualStudioProject>
|
||||
@ -19,7 +19,7 @@
|
||||
<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\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"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\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\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2"
|
||||
MinimalRebuild="FALSE"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -66,7 +66,7 @@
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\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"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\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\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2"
|
||||
BasicRuntimeChecks="0"
|
||||
RuntimeLibrary="0"
|
||||
@ -113,7 +113,7 @@
|
||||
<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\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"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\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\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2;WITH_OPENEXR"
|
||||
MinimalRebuild="FALSE"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -160,7 +160,7 @@
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\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"
|
||||
AdditionalIncludeDirectories="..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\zlib\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\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2, WITH_OPENEXR"
|
||||
BasicRuntimeChecks="0"
|
||||
RuntimeLibrary="0"
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\radiosity\extern\include"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\..\build\msvc_7\extern\glew\include"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
@ -73,7 +73,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\radiosity\extern\include"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\..\build\msvc_7\extern\glew\include"
|
||||
PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include"
|
||||
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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
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"
|
||||
@ -73,7 +73,7 @@
|
||||
<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;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_7\extern\glew\include"
|
||||
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;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER;WITH_QUICKTIME;INTERNATIONAL;WITH_VERSE;WITH_OPENEXR;WITH_DDS;WITH_BULLET = 1;WITH_FFMPEG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="WIN32;_LIB;_DEBUG;WITH_GLEXT"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -74,7 +74,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\ketsji;..\..\..\source\gameengine\network;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Physics\Sumo;..\..\..\source\gameengine\Physics\common;..\..\..\source\gameengine\network\loopbacknetwork;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\Physics\Sumo\Fuzzics\include;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
|
||||
StringPooling="TRUE"
|
||||
BasicRuntimeChecks="0"
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="WIN32,_LIB,_DEBUG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -73,7 +73,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,USE_SUMO_SOLID"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
@ -126,7 +126,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="WIN32,_LIB,_DEBUG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -178,7 +178,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,USE_SUMO_SOLID"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="2"
|
||||
@ -231,7 +231,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="WIN32,_LIB,_DEBUG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -283,7 +283,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Ketsji;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\ode;..\..\..\source\gameengine\SceneGraph;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\BlenderRoutines;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\source\gameengine\rasterizer\ras_openglrasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\gameengine\soundsystem\snd_blenderwavecache;..\..\..\source\sumo\include;..\..\..\source\sumo\Fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,USE_SUMO_SOLID"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna"
|
||||
PreprocessorDefinitions="WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -73,7 +73,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna"
|
||||
PreprocessorDefinitions="WIN32,_LIB,EXP_PYTHON_EMBEDDING,_DEBUG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -125,7 +125,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="2"
|
||||
@ -177,7 +177,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
@ -229,7 +229,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna"
|
||||
PreprocessorDefinitions="WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -281,7 +281,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\blender\makesdna"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna"
|
||||
PreprocessorDefinitions="WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -73,7 +73,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
@ -125,7 +125,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="2"
|
||||
@ -177,7 +177,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna"
|
||||
PreprocessorDefinitions="WIN32,_LIB,EXP_PYTHON_EMBEDDING,_DEBUG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -229,7 +229,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna"
|
||||
PreprocessorDefinitions="WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -281,7 +281,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\Rasterizer;..\..\..\source\blender\makesdna"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,EXP_PYTHON_EMBEDDING"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="2"
|
||||
@ -74,7 +74,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -126,7 +126,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID;WITH_GLEXT"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -179,7 +179,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
@ -232,7 +232,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID;WITH_GLEXT"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -285,7 +285,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x"
|
||||
AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\sdl\include;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenkernel;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\physics;..\..\..\source\gameengine\rasterizer;..\..\..\source\gameengine\network;..\..\..\source\gameengine\Converter;..\..\..\source\gameengine\gamelogic;..\..\..\source\gameengine\scenegraph;..\..\..\source\gameengine\expressions;..\..\..\source\gameengine\physics\sumo;..\..\..\source\gameengine\physics\dummy;..\..\..\source\gameengine\physics\BlOde;..\..\..\source\gameengine\ketsji\kxnetwork;..\..\..\source\gameengine\physics\common;..\..\..\source\gameengine\physics\sumo\include;..\..\..\source\gameengine\physics\common\dummy;..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer;..\..\..\source\gameengine\physics\sumo\fuzzics\include;..\..\..\source\sumo\include;..\..\..\source\sumo\fuzzics\include;..\..\..\source\gameengine\physics\bullet;..\..\..\source\blender\python\api2_2x;..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\kernel\gen_system"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
|
||||
MinimalRebuild="FALSE"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -64,7 +64,7 @@
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\kernel\gen_system"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
|
||||
RuntimeLibrary="0"
|
||||
UsePrecompiledHeader="2"
|
||||
@ -107,7 +107,7 @@
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\kernel\gen_system"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
|
||||
RuntimeLibrary="0"
|
||||
UsePrecompiledHeader="2"
|
||||
@ -197,7 +197,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\kernel\gen_system"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
|
||||
MinimalRebuild="FALSE"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -242,7 +242,7 @@
|
||||
CharacterSet="2">
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\kernel\gen_system"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
|
||||
RuntimeLibrary="2"
|
||||
UsePrecompiledHeader="2"
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -73,7 +73,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_GLEXT"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -125,7 +125,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="2"
|
||||
@ -177,7 +177,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_GLEXT"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
@ -229,7 +229,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_GLEXT"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -281,7 +281,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
|
||||
AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\source\blender\gpu"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_GLEXT"
|
||||
StringPooling="TRUE"
|
||||
RuntimeLibrary="0"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 66 KiB After Width: | Height: | Size: 67 KiB |
@ -61,8 +61,20 @@ def get_object_images(ob):
|
||||
|
||||
me.activeUVLayer = orig_uvlayer
|
||||
|
||||
|
||||
# Now get material images
|
||||
for mat in me.materials:
|
||||
if mat:
|
||||
for mtex in mat.getTextures():
|
||||
if mtex:
|
||||
tex = mtex.tex
|
||||
i = tex.getImage()
|
||||
if i: unique_images[i.name] = i
|
||||
|
||||
return unique_images.values()
|
||||
|
||||
|
||||
|
||||
# Todo, support other object types, materials
|
||||
return []
|
||||
|
||||
@ -118,7 +130,7 @@ def main():
|
||||
def activate(ob, scn):
|
||||
bpy.data.scenes.active = scn
|
||||
scn.objects.selected = []
|
||||
scn.Layers = ob.Layers
|
||||
scn.Layers = ob.Layers & (1<<20)-1
|
||||
ob.sel = 1
|
||||
|
||||
def name_cmp(name_search, name_found):
|
||||
@ -195,11 +207,13 @@ def main():
|
||||
activate(ob, scn)
|
||||
return
|
||||
if NAME_TEXTURE:
|
||||
for tex in mat.getTextures():
|
||||
if tex:
|
||||
if name_cmp(NAME_MATERIAL, tex.name):
|
||||
activate(ob, scn)
|
||||
return
|
||||
for mtex in mat.getTextures():
|
||||
if mtex:
|
||||
tex = mtex.tex
|
||||
if tex:
|
||||
if name_cmp(NAME_TEXTURE, tex.name):
|
||||
activate(ob, scn)
|
||||
return
|
||||
|
||||
|
||||
Draw.PupMenu('No Objects Found')
|
||||
|
||||
93
release/scripts/scripttemplate_gamelogic.py
Normal file
93
release/scripts/scripttemplate_gamelogic.py
Normal file
@ -0,0 +1,93 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'GameLogic Example'
|
||||
Blender: 245
|
||||
Group: 'ScriptTemplate'
|
||||
Tooltip: 'Script template with examples of how to use game logic'
|
||||
"""
|
||||
|
||||
from Blender import Window
|
||||
import bpy
|
||||
|
||||
script_data = \
|
||||
'''
|
||||
# GameLogic has been added to the global namespace no need to import
|
||||
|
||||
# for keyboard event comparison
|
||||
# import GameKeys
|
||||
|
||||
# support for Vector(), Matrix() types and advanced functions like AngleBetweenVecs(v1,v2) and RotationMatrix(...)
|
||||
# import Mathutils
|
||||
|
||||
# for functions like getWindowWidth(), getWindowHeight()
|
||||
# import Rasterizer
|
||||
|
||||
def main():
|
||||
cont = GameLogic.getCurrentController()
|
||||
|
||||
# The KX_GameObject that owns this controller.
|
||||
own = cont.getOwner()
|
||||
|
||||
# for scripts that deal with spacial logic
|
||||
own_pos = own.getPosition()
|
||||
|
||||
|
||||
# Some example functions, remove to write your own script.
|
||||
# check for a positive sensor, will run on any object without errors.
|
||||
print 'Logic info for KX_GameObject', own.getName()
|
||||
input = False
|
||||
|
||||
for sens in cont.getSensors():
|
||||
# The sensor can be on another object, we may want to use it
|
||||
own_sens = sens.getOwner()
|
||||
print ' sensor:', sens.getName(),
|
||||
if sens.isPositive():
|
||||
print '(true)'
|
||||
input = True
|
||||
else:
|
||||
print '(false)'
|
||||
|
||||
for actu in cont.getActuators():
|
||||
# The actuator can be on another object, we may want to use it
|
||||
own_actu = actu.getOwner()
|
||||
print ' actuator:', sens.getName()
|
||||
|
||||
# This runs the actuator or turns it off
|
||||
# note that actuators will continue to run unless explicitly turned off.
|
||||
if input:
|
||||
GameLogic.addActiveActuator(actu, True)
|
||||
else:
|
||||
GameLogic.addActiveActuator(actu, False)
|
||||
|
||||
# Its also good practice to get sensors and actuators by names
|
||||
# so any changes to their order wont break the script.
|
||||
|
||||
# sens_key = cont.getSensor('key_sensor')
|
||||
# actu_motion = cont.getActuator('motion')
|
||||
|
||||
|
||||
# Loop through all other objects in the scene
|
||||
sce = GameLogic.getCurrentScene()
|
||||
print 'Scene Objects:', sce.getName()
|
||||
for ob in sce.getObjectList():
|
||||
print ' ', ob.getName(), ob.getPosition()
|
||||
|
||||
|
||||
# Example where collision objects are checked for their properties
|
||||
# adding to our objects "life" property
|
||||
"""
|
||||
actu_collide = cont.getSensor('collision_sens')
|
||||
for ob in actu_collide.getHitObjectList():
|
||||
# Check to see the object has this property
|
||||
if hasattr(ob, 'life'):
|
||||
own.life += ob.life
|
||||
ob.life = 0
|
||||
print own.life
|
||||
"""
|
||||
main()
|
||||
'''
|
||||
|
||||
new_text = bpy.data.texts.new('gamelogic_example.py')
|
||||
new_text.write(script_data)
|
||||
bpy.data.texts.active = new_text
|
||||
Window.RedrawAll()
|
||||
33
release/scripts/scripttemplate_gamelogic_basic.py
Normal file
33
release/scripts/scripttemplate_gamelogic_basic.py
Normal file
@ -0,0 +1,33 @@
|
||||
#!BPY
|
||||
"""
|
||||
Name: 'GameLogic Template'
|
||||
Blender: 245
|
||||
Group: 'ScriptTemplate'
|
||||
Tooltip: 'Basic template for new game logic scripts'
|
||||
"""
|
||||
|
||||
from Blender import Window
|
||||
import bpy
|
||||
|
||||
script_data = \
|
||||
'''
|
||||
def main():
|
||||
|
||||
cont = GameLogic.getCurrentController()
|
||||
own = cont.getOwner()
|
||||
|
||||
sens = cont.getSensor('mySensor')
|
||||
actu = cont.getActuator('myActuator')
|
||||
|
||||
if sens.isPositive():
|
||||
GameLogic.addActiveActuator(actu, True)
|
||||
else:
|
||||
GameLogic.addActiveActuator(actu, False)
|
||||
|
||||
main()
|
||||
'''
|
||||
|
||||
new_text = bpy.data.texts.new('gamelogic_example.py')
|
||||
new_text.write(script_data)
|
||||
bpy.data.texts.active = new_text
|
||||
Window.RedrawAll()
|
||||
@ -159,7 +159,7 @@ float get_action_frame(struct Object *ob, float cframe);
|
||||
/* map strip time to global time (frame nr) */
|
||||
float get_action_frame_inv(struct Object *ob, float cframe);
|
||||
/* builds a list of NlaIpoChannel with ipo values to write in datablock */
|
||||
void extract_ipochannels_from_action(ListBase *lb, struct ID *id, struct bAction *act, char *name, float ctime);
|
||||
void extract_ipochannels_from_action(ListBase *lb, struct ID *id, struct bAction *act, const char *name, float ctime);
|
||||
/* write values returned by extract_ipochannels_from_action, returns the number of value written */
|
||||
int execute_ipochannels(ListBase *lb);
|
||||
|
||||
|
||||
@ -862,7 +862,7 @@ typedef struct NlaIpoChannel {
|
||||
int type;
|
||||
} NlaIpoChannel;
|
||||
|
||||
void extract_ipochannels_from_action(ListBase *lb, ID *id, bAction *act, char *name, float ctime)
|
||||
void extract_ipochannels_from_action(ListBase *lb, ID *id, bAction *act, const char *name, float ctime)
|
||||
{
|
||||
bActionChannel *achan= get_action_channel(act, name);
|
||||
IpoCurve *icu;
|
||||
|
||||
@ -1690,7 +1690,7 @@ static void initialize_posetree(struct Object *ob, bPoseChannel *pchan_tip)
|
||||
were executed & assigned. Now as last we do an IK pass */
|
||||
static void execute_posetree(Object *ob, PoseTree *tree)
|
||||
{
|
||||
float R_parmat[3][3];
|
||||
float R_parmat[3][3], identity[3][3];
|
||||
float iR_parmat[3][3];
|
||||
float R_bonemat[3][3];
|
||||
float goalrot[3][3], goalpos[3];
|
||||
@ -1699,7 +1699,8 @@ static void execute_posetree(Object *ob, PoseTree *tree)
|
||||
float irest_basis[3][3], full_basis[3][3];
|
||||
float end_pose[4][4], world_pose[4][4];
|
||||
float length, basis[3][3], rest_basis[3][3], start[3], *ikstretch=NULL;
|
||||
int a, flag, hasstretch=0;
|
||||
float resultinf=0.0f;
|
||||
int a, flag, hasstretch=0, resultblend=0;
|
||||
bPoseChannel *pchan;
|
||||
IK_Segment *seg, *parent, **iktree, *iktarget;
|
||||
IK_Solver *solver;
|
||||
@ -1844,6 +1845,12 @@ static void execute_posetree(Object *ob, PoseTree *tree)
|
||||
Mat4MulMat4(goal, rootmat, goalinv);
|
||||
VECCOPY(polepos, goal[3]);
|
||||
poleconstrain= 1;
|
||||
|
||||
/* for pole targets, we blend the result of the ik solver
|
||||
* instead of the target position, otherwise we can't get
|
||||
* a smooth transition */
|
||||
resultblend= 1;
|
||||
resultinf= target->con->enforce;
|
||||
|
||||
if(data->flag & CONSTRAINT_IK_GETANGLE) {
|
||||
poleangledata= data;
|
||||
@ -1853,7 +1860,7 @@ static void execute_posetree(Object *ob, PoseTree *tree)
|
||||
}
|
||||
|
||||
/* do we need blending? */
|
||||
if (target->con->enforce!=1.0) {
|
||||
if (!resultblend && target->con->enforce!=1.0) {
|
||||
float q1[4], q2[4], q[4];
|
||||
float fac= target->con->enforce;
|
||||
float mfac= 1.0-fac;
|
||||
@ -1903,7 +1910,7 @@ static void execute_posetree(Object *ob, PoseTree *tree)
|
||||
tree->basis_change= MEM_mallocN(sizeof(float[3][3])*tree->totchannel, "ik basis change");
|
||||
if(hasstretch)
|
||||
ikstretch= MEM_mallocN(sizeof(float)*tree->totchannel, "ik stretch");
|
||||
|
||||
|
||||
for(a=0; a<tree->totchannel; a++) {
|
||||
IK_GetBasisChange(iktree[a], tree->basis_change[a]);
|
||||
|
||||
@ -1931,6 +1938,12 @@ static void execute_posetree(Object *ob, PoseTree *tree)
|
||||
VecMulf(tree->basis_change[a][1], stretch);
|
||||
VecMulf(tree->basis_change[a][2], stretch);
|
||||
}
|
||||
|
||||
if(resultblend && resultinf!=1.0f) {
|
||||
Mat3One(identity);
|
||||
Mat3BlendMat3(tree->basis_change[a], identity,
|
||||
tree->basis_change[a], resultinf);
|
||||
}
|
||||
|
||||
IK_FreeSegment(iktree[a]);
|
||||
}
|
||||
|
||||
@ -367,19 +367,12 @@ void constraint_mat_convertspace (Object *ob, bPoseChannel *pchan, float mat[][4
|
||||
case CONSTRAINT_SPACE_WORLD: /* ---------- FROM WORLDSPACE ---------- */
|
||||
{
|
||||
/* world to pose */
|
||||
if (to==CONSTRAINT_SPACE_POSE || to==CONSTRAINT_SPACE_LOCAL || to==CONSTRAINT_SPACE_PARLOCAL) {
|
||||
Mat4Invert(imat, ob->obmat);
|
||||
Mat4CpyMat4(tempmat, mat);
|
||||
Mat4MulMat4(mat, tempmat, imat);
|
||||
}
|
||||
Mat4Invert(imat, ob->obmat);
|
||||
Mat4CpyMat4(tempmat, mat);
|
||||
Mat4MulMat4(mat, tempmat, imat);
|
||||
|
||||
/* pose to local */
|
||||
if (to == CONSTRAINT_SPACE_LOCAL) {
|
||||
/* call self with slightly different values */
|
||||
constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
|
||||
}
|
||||
/* pose to local + parent */
|
||||
else if (to == CONSTRAINT_SPACE_PARLOCAL) {
|
||||
/* use pose-space as stepping stone for other spaces... */
|
||||
if (ELEM(to, CONSTRAINT_SPACE_LOCAL, CONSTRAINT_SPACE_PARLOCAL)) {
|
||||
/* call self with slightly different values */
|
||||
constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
|
||||
}
|
||||
@ -445,69 +438,66 @@ void constraint_mat_convertspace (Object *ob, bPoseChannel *pchan, float mat[][4
|
||||
break;
|
||||
case CONSTRAINT_SPACE_LOCAL: /* ------------ FROM LOCALSPACE --------- */
|
||||
{
|
||||
/* local to pose */
|
||||
if (to==CONSTRAINT_SPACE_POSE || to==CONSTRAINT_SPACE_WORLD) {
|
||||
/* do inverse procedure that was done for pose to local */
|
||||
if (pchan->bone) {
|
||||
/* we need the posespace_matrix = local_matrix + (parent_posespace_matrix + restpos) */
|
||||
if (pchan->parent) {
|
||||
float offs_bone[4][4];
|
||||
/* local to pose - do inverse procedure that was done for pose to local */
|
||||
if (pchan->bone) {
|
||||
/* we need the posespace_matrix = local_matrix + (parent_posespace_matrix + restpos) */
|
||||
if (pchan->parent) {
|
||||
float offs_bone[4][4];
|
||||
|
||||
/* construct offs_bone the same way it is done in armature.c */
|
||||
Mat4CpyMat3(offs_bone, pchan->bone->bone_mat);
|
||||
VECCOPY(offs_bone[3], pchan->bone->head);
|
||||
offs_bone[3][1]+= pchan->bone->parent->length;
|
||||
|
||||
if (pchan->bone->flag & BONE_HINGE) {
|
||||
/* pose_mat = par_pose-space_location * chan_mat */
|
||||
float tmat[4][4];
|
||||
|
||||
/* construct offs_bone the same way it is done in armature.c */
|
||||
Mat4CpyMat3(offs_bone, pchan->bone->bone_mat);
|
||||
VECCOPY(offs_bone[3], pchan->bone->head);
|
||||
offs_bone[3][1]+= pchan->bone->parent->length;
|
||||
/* the rotation of the parent restposition */
|
||||
Mat4CpyMat4(tmat, pchan->bone->parent->arm_mat);
|
||||
|
||||
if (pchan->bone->flag & BONE_HINGE) {
|
||||
/* pose_mat = par_pose-space_location * chan_mat */
|
||||
float tmat[4][4];
|
||||
|
||||
/* the rotation of the parent restposition */
|
||||
Mat4CpyMat4(tmat, pchan->bone->parent->arm_mat);
|
||||
|
||||
/* the location of actual parent transform */
|
||||
VECCOPY(tmat[3], offs_bone[3]);
|
||||
offs_bone[3][0]= offs_bone[3][1]= offs_bone[3][2]= 0.0f;
|
||||
Mat4MulVecfl(pchan->parent->pose_mat, tmat[3]);
|
||||
|
||||
Mat4MulMat4(diff_mat, offs_bone, tmat);
|
||||
Mat4CpyMat4(tempmat, mat);
|
||||
Mat4MulMat4(mat, tempmat, diff_mat);
|
||||
}
|
||||
else {
|
||||
/* pose_mat = par_pose_mat * bone_mat * chan_mat */
|
||||
Mat4MulMat4(diff_mat, offs_bone, pchan->parent->pose_mat);
|
||||
Mat4CpyMat4(tempmat, mat);
|
||||
Mat4MulMat4(mat, tempmat, diff_mat);
|
||||
}
|
||||
/* the location of actual parent transform */
|
||||
VECCOPY(tmat[3], offs_bone[3]);
|
||||
offs_bone[3][0]= offs_bone[3][1]= offs_bone[3][2]= 0.0f;
|
||||
Mat4MulVecfl(pchan->parent->pose_mat, tmat[3]);
|
||||
|
||||
Mat4MulMat4(diff_mat, offs_bone, tmat);
|
||||
Mat4CpyMat4(tempmat, mat);
|
||||
Mat4MulMat4(mat, tempmat, diff_mat);
|
||||
}
|
||||
else {
|
||||
Mat4CpyMat4(diff_mat, pchan->bone->arm_mat);
|
||||
|
||||
/* pose_mat = par_pose_mat * bone_mat * chan_mat */
|
||||
Mat4MulMat4(diff_mat, offs_bone, pchan->parent->pose_mat);
|
||||
Mat4CpyMat4(tempmat, mat);
|
||||
Mat4MulMat4(mat, tempmat, diff_mat);
|
||||
}
|
||||
}
|
||||
else {
|
||||
Mat4CpyMat4(diff_mat, pchan->bone->arm_mat);
|
||||
|
||||
Mat4CpyMat4(tempmat, mat);
|
||||
Mat4MulMat4(mat, tempmat, diff_mat);
|
||||
}
|
||||
}
|
||||
/* local to world */
|
||||
if (to == CONSTRAINT_SPACE_WORLD) {
|
||||
|
||||
/* use pose-space as stepping stone for other spaces */
|
||||
if (ELEM(to, CONSTRAINT_SPACE_WORLD, CONSTRAINT_SPACE_PARLOCAL)) {
|
||||
/* call self with slightly different values */
|
||||
constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
case CONSTRAINT_SPACE_PARLOCAL: /* -------------- FROM LOCAL WITH PARENT ---------- */
|
||||
{
|
||||
/* local to pose */
|
||||
if (to==CONSTRAINT_SPACE_POSE || to==CONSTRAINT_SPACE_WORLD) {
|
||||
if (pchan->bone) {
|
||||
Mat4CpyMat4(diff_mat, pchan->bone->arm_mat);
|
||||
Mat4CpyMat4(tempmat, mat);
|
||||
Mat4MulMat4(mat, diff_mat, tempmat);
|
||||
}
|
||||
/* local + parent to pose */
|
||||
if (pchan->bone) {
|
||||
Mat4CpyMat4(diff_mat, pchan->bone->arm_mat);
|
||||
Mat4CpyMat4(tempmat, mat);
|
||||
Mat4MulMat4(mat, diff_mat, tempmat);
|
||||
}
|
||||
/* local to world */
|
||||
if (to == CONSTRAINT_SPACE_WORLD) {
|
||||
|
||||
/* use pose-space as stepping stone for other spaces */
|
||||
if (ELEM(to, CONSTRAINT_SPACE_WORLD, CONSTRAINT_SPACE_LOCAL)) {
|
||||
/* call self with slightly different values */
|
||||
constraint_mat_convertspace(ob, pchan, mat, CONSTRAINT_SPACE_POSE, to);
|
||||
}
|
||||
|
||||
@ -794,12 +794,18 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
|
||||
if(amd->fit_type == MOD_ARR_FITCURVE && amd->curve_ob) {
|
||||
Curve *cu = amd->curve_ob->data;
|
||||
if(cu) {
|
||||
float tmp_mat[3][3];
|
||||
float scale;
|
||||
|
||||
object_to_mat3(amd->curve_ob, tmp_mat);
|
||||
scale = Mat3ToScalef(tmp_mat);
|
||||
|
||||
if(!cu->path) {
|
||||
cu->flag |= CU_PATH; // needed for path & bevlist
|
||||
makeDispListCurveTypes(amd->curve_ob, 0);
|
||||
}
|
||||
if(cu->path)
|
||||
length = cu->path->totdist;
|
||||
length = scale*cu->path->totdist;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -696,9 +696,11 @@ float dof_camera(Object *ob)
|
||||
if (cam->dof_ob) {
|
||||
/* too simple, better to return the distance on the view axis only
|
||||
* return VecLenf(ob->obmat[3], cam->dof_ob->obmat[3]); */
|
||||
float mat[4][4], obmat[4][4];
|
||||
|
||||
float mat[4][4];
|
||||
Mat4Invert(ob->imat, ob->obmat);
|
||||
Mat4CpyMat4(obmat, ob->obmat);
|
||||
Mat4Ortho(obmat);
|
||||
Mat4Invert(ob->imat, obmat);
|
||||
Mat4MulMat4(mat, cam->dof_ob->obmat, ob->imat);
|
||||
return fabs(mat[3][2]);
|
||||
}
|
||||
|
||||
@ -3875,7 +3875,7 @@ static void boid_body(BoidVecFunc *bvf, ParticleData *pa, ParticleSystem *psys,
|
||||
state->vel[2]=0.0;
|
||||
state->co[2]=part->groundz;
|
||||
|
||||
if(psys->keyed_ob){
|
||||
if(psys->keyed_ob && (psys->keyed_ob->type == OB_MESH)){
|
||||
Object *zob=psys->keyed_ob;
|
||||
int min_face;
|
||||
float co1[3],co2[3],min_d=2.0,min_w[4],imat[4][4];
|
||||
|
||||
@ -1622,23 +1622,23 @@ void *exec_scan_for_ext_spring_forces(void *data)
|
||||
|
||||
void sb_sfesf_threads_run(struct Object *ob, float timenow,int totsprings,int *ptr_to_break_func())
|
||||
{
|
||||
ListBase *do_effector = NULL;
|
||||
ListBase *do_effector = NULL;
|
||||
ListBase threads;
|
||||
SB_thread_context *sb_threads;
|
||||
int i, totthread,left,dec;
|
||||
int lowsprings =10; /* wild guess .. may increase with better thread management 'above' or even be UI option sb->spawn_cf_threads_nopts */
|
||||
int lowsprings =100; /* wild guess .. may increase with better thread management 'above' or even be UI option sb->spawn_cf_threads_nopts */
|
||||
|
||||
do_effector= pdInitEffectors(ob,NULL);
|
||||
|
||||
/* figure the number of threads while preventing pretty pointless threading overhead */
|
||||
if(totsprings < lowsprings) {totthread=1;}
|
||||
else{
|
||||
if(G.scene->r.mode & R_FIXED_THREADS)
|
||||
totthread= G.scene->r.threads;
|
||||
else
|
||||
totthread= BLI_system_thread_count();
|
||||
if(G.scene->r.mode & R_FIXED_THREADS)
|
||||
totthread= G.scene->r.threads;
|
||||
else
|
||||
totthread= BLI_system_thread_count();
|
||||
/* what if we got zillions of CPUs running but less to spread*/
|
||||
while ((totsprings/totthread < lowsprings) && (totthread > 1)) {
|
||||
totthread--;
|
||||
}
|
||||
/*left to do--> what if we got zillions of CPUs running but 'totsprings' tasks to spread*/
|
||||
|
||||
sb_threads= MEM_callocN(sizeof(SB_thread_context)*totthread, "SBSpringsThread");
|
||||
memset(sb_threads, 0, sizeof(SB_thread_context)*totthread);
|
||||
@ -2279,6 +2279,11 @@ int _softbody_calc_forces_slice_in_a_thread(Object *ob, float forcetime, float t
|
||||
float kd = 1.0f;
|
||||
|
||||
if (sb_deflect_face(ob,bp->pos,facenormal,defforce,&cf,timenow,vel,&intrusion)){
|
||||
if (intrusion < 0.0f){
|
||||
sb->scratch->flag |= SBF_DOFUZZY;
|
||||
bp->flag |= SBF_DOFUZZY;
|
||||
bp->choke = sb->choke*0.01f;
|
||||
}
|
||||
|
||||
VECSUB(cfforce,bp->vec,vel);
|
||||
Vec3PlusStVec(bp->force,-cf*50.0f,cfforce);
|
||||
@ -2326,17 +2331,19 @@ void sb_cf_threads_run(struct Object *ob, float forcetime, float timenow,int tot
|
||||
ListBase threads;
|
||||
SB_thread_context *sb_threads;
|
||||
int i, totthread,left,dec;
|
||||
int lowpoints =10; /* wild guess .. may increase with better thread management 'above' or even be UI option sb->spawn_cf_threads_nopts */
|
||||
int lowpoints =100; /* wild guess .. may increase with better thread management 'above' or even be UI option sb->spawn_cf_threads_nopts */
|
||||
|
||||
/* figure the number of threads while preventing pretty pointless threading overhead */
|
||||
if(totpoint < lowpoints) {totthread=1;}
|
||||
else{
|
||||
if(G.scene->r.mode & R_FIXED_THREADS)
|
||||
totthread= G.scene->r.threads;
|
||||
else
|
||||
totthread= BLI_system_thread_count();
|
||||
if(G.scene->r.mode & R_FIXED_THREADS)
|
||||
totthread= G.scene->r.threads;
|
||||
else
|
||||
totthread= BLI_system_thread_count();
|
||||
/* what if we got zillions of CPUs running but less to spread*/
|
||||
while ((totpoint/totthread < lowpoints) && (totthread > 1)) {
|
||||
totthread--;
|
||||
}
|
||||
/*left to do--> what if we got zillions of CPUs running but 'totpoint' tasks to spread*/
|
||||
|
||||
/* printf("sb_cf_threads_run spawning %d threads \n",totthread); */
|
||||
|
||||
sb_threads= MEM_callocN(sizeof(SB_thread_context)*totthread, "SBThread");
|
||||
memset(sb_threads, 0, sizeof(SB_thread_context)*totthread);
|
||||
@ -2425,7 +2432,7 @@ static void softbody_calc_forcesEx(Object *ob, float forcetime, float timenow, i
|
||||
static void softbody_calc_forces(Object *ob, float forcetime, float timenow, int nl_flags)
|
||||
{
|
||||
/* redirection to the new threaded Version */
|
||||
if (G.rt !=16){
|
||||
if (!(G.rt & 0x10)){ // 16
|
||||
softbody_calc_forcesEx(ob, forcetime, timenow, nl_flags);
|
||||
return;
|
||||
}
|
||||
@ -2433,6 +2440,10 @@ static void softbody_calc_forces(Object *ob, float forcetime, float timenow, int
|
||||
/* so the following will die */
|
||||
/* |||||||||||||||||||||||||| */
|
||||
/* VVVVVVVVVVVVVVVVVVVVVVVVVV */
|
||||
/*backward compatibility note:
|
||||
fixing bug [17428] which forces adaptive step size to tiny steps
|
||||
in some situations
|
||||
.. keeping G.rt==17 0x11 option for old files 'needing' the bug*/
|
||||
|
||||
/* rule we never alter free variables :bp->vec bp->pos in here !
|
||||
* this will ruin adaptive stepsize AKA heun! (BM)
|
||||
@ -2681,14 +2692,25 @@ static void softbody_calc_forces(Object *ob, float forcetime, float timenow, int
|
||||
|
||||
if (sb_deflect_face(ob,bp->pos,facenormal,defforce,&cf,timenow,vel,&intrusion)){
|
||||
if ((!nl_flags)&&(intrusion < 0.0f)){
|
||||
/*bjornmose: uugh.. what an evil hack
|
||||
violation of the 'don't touch bp->pos in here' rule
|
||||
but works nice, like this-->
|
||||
we predict the solution beeing out of the collider
|
||||
in heun step No1 and leave the heun step No2 adapt to it
|
||||
so we kind of introduced a implicit solver for this case
|
||||
*/
|
||||
Vec3PlusStVec(bp->pos,-intrusion,facenormal);
|
||||
if(G.rt & 0x01){ // 17 we did check for bit 0x10 before
|
||||
/*fixing bug [17428] this forces adaptive step size to tiny steps
|
||||
in some situations .. keeping G.rt==17 option for old files 'needing' the bug
|
||||
*/
|
||||
/*bjornmose: uugh.. what an evil hack
|
||||
violation of the 'don't touch bp->pos in here' rule
|
||||
but works nice, like this-->
|
||||
we predict the solution beeing out of the collider
|
||||
in heun step No1 and leave the heun step No2 adapt to it
|
||||
so we kind of introduced a implicit solver for this case
|
||||
*/
|
||||
Vec3PlusStVec(bp->pos,-intrusion,facenormal);
|
||||
}
|
||||
else{
|
||||
|
||||
VECSUB(cfforce,bp->vec,vel);
|
||||
Vec3PlusStVec(bp->force,-cf*50.0f,cfforce);
|
||||
}
|
||||
|
||||
|
||||
sb->scratch->flag |= SBF_DOFUZZY;
|
||||
bp->flag |= SBF_DOFUZZY;
|
||||
@ -4040,7 +4062,7 @@ static void softbody_step(Object *ob, SoftBody *sb, float dtime)
|
||||
|
||||
if(sb->solverflags & SBSO_MONITOR ){
|
||||
sct=PIL_check_seconds_timer();
|
||||
if (sct-sst > 0.5f) printf(" solver time %f sec %s \n",sct-sst,ob->id.name);
|
||||
if ((sct-sst > 0.5f) || (G.f & G_DEBUG)) printf(" solver time %f sec %s \n",sct-sst,ob->id.name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -700,6 +700,7 @@ DerivedMesh *ss_to_cdderivedmesh(CCGSubSurf *ss, int ssFromEditmesh,
|
||||
for(index = 0; index < totedge; index++) {
|
||||
CCGEdge *e = edgeMap2[index];
|
||||
unsigned int flags = 0;
|
||||
char bweight = 0;
|
||||
int edgeIdx = GET_INT_FROM_POINTER(ccgSubSurf_getEdgeEdgeHandle(ss, e));
|
||||
|
||||
if(!ccgSubSurf_getEdgeNumFaces(ss, e)) flags |= ME_LOOSEEDGE;
|
||||
@ -710,12 +711,14 @@ DerivedMesh *ss_to_cdderivedmesh(CCGSubSurf *ss, int ssFromEditmesh,
|
||||
dm->getEdge(dm, edgeIdx, &origMed);
|
||||
|
||||
flags |= origMed.flag;
|
||||
bweight = origMed.bweight;
|
||||
}
|
||||
|
||||
for(x = 0; x < edgeSize - 1; x++) {
|
||||
med->v1 = getEdgeIndex(ss, e, x, edgeSize);
|
||||
med->v2 = getEdgeIndex(ss, e, x + 1, edgeSize);
|
||||
med->flag = flags;
|
||||
med->bweight = bweight;
|
||||
*origIndex = ccgDM_getEdgeMapIndex(NULL, ss, e);
|
||||
++med;
|
||||
++origIndex;
|
||||
|
||||
@ -44,12 +44,12 @@
|
||||
static Text *activeToolText = NULL;
|
||||
static SuggList suggestions = {NULL, NULL, NULL, NULL, NULL};
|
||||
static char *documentation = NULL;
|
||||
static int doc_lines = 0;
|
||||
//static int doc_lines = 0;
|
||||
|
||||
static int txttl_cmp(const char *first, const char *second, int len) {
|
||||
int cmp, i;
|
||||
for (cmp=0, i=0; i<len; i++) {
|
||||
if (cmp= toupper(first[i])-toupper(second[i])) {
|
||||
if ( (cmp= toupper(first[i])-toupper(second[i])) ) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2243,7 +2243,7 @@ void txt_delete_char (Text *text)
|
||||
if ((mrk->flags & TMARK_TEMP) && !(mrk->flags & TMARK_EDITALL)) {
|
||||
txt_clear_markers(text, mrk->group, TMARK_TEMP);
|
||||
} else {
|
||||
TextMarker *nxt= mrk->next;
|
||||
//TextMarker *nxt= mrk->next;
|
||||
BLI_freelinkN(&text->markers, mrk);
|
||||
}
|
||||
return;
|
||||
@ -2308,7 +2308,7 @@ void txt_backspace_char (Text *text)
|
||||
if ((mrk->flags & TMARK_TEMP) && !(mrk->flags & TMARK_EDITALL)) {
|
||||
txt_clear_markers(text, mrk->group, TMARK_TEMP);
|
||||
} else {
|
||||
TextMarker *nxt= mrk->next;
|
||||
//TextMarker *nxt= mrk->next;
|
||||
BLI_freelinkN(&text->markers, mrk);
|
||||
}
|
||||
return;
|
||||
|
||||
@ -164,6 +164,7 @@ void Mat3Inv(float m1[][3], float m2[][3]);
|
||||
void Mat3CpyMat4(float m1[][3],float m2[][4]);
|
||||
void Mat4CpyMat3(float m1[][4], float m2[][3]);
|
||||
|
||||
void Mat3BlendMat3(float out[][3], float dst[][3], float src[][3], float srcweight);
|
||||
void Mat4BlendMat4(float out[][4], float dst[][4], float src[][4], float srcweight);
|
||||
|
||||
float Det2x2(float a,float b,float c, float d);
|
||||
|
||||
@ -24,4 +24,4 @@ if env['OURPLATFORM'] == 'linux2':
|
||||
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
|
||||
incs += ' ' + env['BF_PTHREADS_INC']
|
||||
|
||||
env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [85,195], compileflags =cflags )
|
||||
env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core', 'intern', 'player'], priority = [85,150,195], compileflags =cflags )
|
||||
|
||||
@ -51,6 +51,7 @@
|
||||
typedef struct BVHNode
|
||||
{
|
||||
struct BVHNode **children;
|
||||
struct BVHNode *parent; // some user defined traversed need that
|
||||
float *bv; // Bounding volume of all nodes, max 13 axis
|
||||
int index; // face, edge, vertex index
|
||||
char totnode; // how many nodes are used, used for speedup
|
||||
@ -481,7 +482,7 @@ static void bvhtree_print_tree(BVHTree *tree, BVHNode *node, int depth)
|
||||
{
|
||||
int i;
|
||||
for(i=0; i<depth; i++) printf(" ");
|
||||
printf(" - %d (%d): ", node->index, node - tree->nodearray);
|
||||
printf(" - %d (%ld): ", node->index, node - tree->nodearray);
|
||||
for(i=2*tree->start_axis; i<2*tree->stop_axis; i++)
|
||||
printf("%.3f ", node->bv[i]);
|
||||
printf("\n");
|
||||
@ -496,10 +497,10 @@ static void bvhtree_info(BVHTree *tree)
|
||||
printf("BVHTree info\n");
|
||||
printf("tree_type = %d, axis = %d, epsilon = %f\n", tree->tree_type, tree->axis, tree->epsilon);
|
||||
printf("nodes = %d, branches = %d, leafs = %d\n", tree->totbranch + tree->totleaf, tree->totbranch, tree->totleaf);
|
||||
printf("Memory per node = %dbytes\n", sizeof(BVHNode) + sizeof(BVHNode*)*tree->tree_type + sizeof(float)*tree->axis);
|
||||
printf("Memory per node = %ldbytes\n", sizeof(BVHNode) + sizeof(BVHNode*)*tree->tree_type + sizeof(float)*tree->axis);
|
||||
printf("BV memory = %dbytes\n", MEM_allocN_len(tree->nodebv));
|
||||
|
||||
printf("Total memory = %dbytes\n", sizeof(BVHTree)
|
||||
printf("Total memory = %ldbytes\n", sizeof(BVHTree)
|
||||
+ MEM_allocN_len(tree->nodes)
|
||||
+ MEM_allocN_len(tree->nodearray)
|
||||
+ MEM_allocN_len(tree->nodechild)
|
||||
@ -700,6 +701,10 @@ static void non_recursive_bvh_div_nodes(BVHTree *tree, BVHNode *branches_array,
|
||||
|
||||
BVHBuildHelper data;
|
||||
int depth;
|
||||
|
||||
// set parent from root node to NULL
|
||||
BVHNode *tmp = branches_array+0;
|
||||
tmp->parent = NULL;
|
||||
|
||||
//Most of bvhtree code relies on 1-leaf trees having at least one branch
|
||||
//We handle that special case here
|
||||
@ -709,7 +714,8 @@ static void non_recursive_bvh_div_nodes(BVHTree *tree, BVHNode *branches_array,
|
||||
refit_kdop_hull(tree, root, 0, num_leafs);
|
||||
root->main_axis = get_largest_axis(root->bv) / 2;
|
||||
root->totnode = 1;
|
||||
root->children[0] = leafs_array[0];
|
||||
root->children[0] = leafs_array[0];
|
||||
root->children[0]->parent = root;
|
||||
return;
|
||||
}
|
||||
|
||||
@ -772,9 +778,15 @@ static void non_recursive_bvh_div_nodes(BVHTree *tree, BVHNode *branches_array,
|
||||
int child_leafs_end = implicit_leafs_index(&data, depth+1, child_level_index+1);
|
||||
|
||||
if(child_leafs_end - child_leafs_begin > 1)
|
||||
{
|
||||
parent->children[k] = branches_array + child_index;
|
||||
parent->children[k]->parent = parent;
|
||||
}
|
||||
else if(child_leafs_end - child_leafs_begin == 1)
|
||||
{
|
||||
parent->children[k] = leafs_array[ child_leafs_begin ];
|
||||
parent->children[k]->parent = parent;
|
||||
}
|
||||
else
|
||||
break;
|
||||
|
||||
@ -1096,7 +1108,7 @@ BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, int *result)
|
||||
BVHOverlapData **data;
|
||||
|
||||
// check for compatibility of both trees (can't compare 14-DOP with 18-DOP)
|
||||
if((tree1->axis != tree2->axis) && ((tree1->axis == 14) || tree2->axis == 14))
|
||||
if((tree1->axis != tree2->axis) && (tree1->axis == 14 || tree2->axis == 14) && (tree1->axis == 18 || tree2->axis == 18))
|
||||
return 0;
|
||||
|
||||
// fast check root nodes for collision before doing big splitting + traversal
|
||||
|
||||
@ -759,6 +759,28 @@ void Mat4MulSerie(float answ[][4], float m1[][4],
|
||||
}
|
||||
}
|
||||
|
||||
void Mat3BlendMat3(float out[][3], float dst[][3], float src[][3], float srcweight)
|
||||
{
|
||||
float squat[4], dquat[4], fquat[4];
|
||||
float ssize[3], dsize[3], fsize[4];
|
||||
float rmat[3][3], smat[3][3];
|
||||
|
||||
Mat3ToQuat(dst, dquat);
|
||||
Mat3ToSize(dst, dsize);
|
||||
|
||||
Mat3ToQuat(src, squat);
|
||||
Mat3ToSize(src, ssize);
|
||||
|
||||
/* do blending */
|
||||
QuatInterpol(fquat, dquat, squat, srcweight);
|
||||
VecLerpf(fsize, dsize, ssize, srcweight);
|
||||
|
||||
/* compose new matrix */
|
||||
QuatToMat3(fquat, rmat);
|
||||
SizeToMat3(fsize, smat);
|
||||
Mat3MulMat3(out, rmat, smat);
|
||||
}
|
||||
|
||||
void Mat4BlendMat4(float out[][4], float dst[][4], float src[][4], float srcweight)
|
||||
{
|
||||
float squat[4], dquat[4], fquat[4];
|
||||
|
||||
@ -4177,6 +4177,9 @@ static void direct_link_screen(FileData *fd, bScreen *sc)
|
||||
sima->cumap= newdataadr(fd, sima->cumap);
|
||||
if(sima->cumap)
|
||||
direct_link_curvemapping(fd, sima->cumap);
|
||||
sima->gpd= newdataadr(fd, sima->gpd);
|
||||
if (sima->gpd)
|
||||
link_gpencil(fd, sima->gpd);
|
||||
sima->iuser.ok= 1;
|
||||
}
|
||||
else if(sl->spacetype==SPACE_NODE) {
|
||||
|
||||
@ -1702,7 +1702,9 @@ static void write_screens(WriteData *wd, ListBase *scrbase)
|
||||
|
||||
writestruct(wd, DATA, "SpaceImage", 1, sl);
|
||||
if(sima->cumap)
|
||||
write_curvemapping(wd, sima->cumap);
|
||||
write_curvemapping(wd, sima->cumap);
|
||||
if(sima->gpd)
|
||||
write_gpencil(wd, sima->gpd);
|
||||
}
|
||||
else if(sl->spacetype==SPACE_IMASEL) {
|
||||
writestruct(wd, DATA, "SpaceImaSel", 1, sl);
|
||||
|
||||
@ -124,7 +124,7 @@ void GPU_material_free(struct Material *ma);
|
||||
|
||||
void GPU_materials_free();
|
||||
|
||||
void GPU_material_bind(GPUMaterial *material, int lay, double time);
|
||||
void GPU_material_bind(GPUMaterial *material, int oblay, int viewlay, double time);
|
||||
void GPU_material_bind_uniforms(GPUMaterial *material, float obmat[][4], float viewmat[][4], float viewinv[][4], float obcol[4]);
|
||||
void GPU_material_unbind(GPUMaterial *material);
|
||||
int GPU_material_bound(GPUMaterial *material);
|
||||
@ -158,7 +158,7 @@ int GPU_lamp_has_shadow_buffer(GPULamp *lamp);
|
||||
void GPU_lamp_shadow_buffer_bind(GPULamp *lamp, float viewmat[][4], int *winsize, float winmat[][4]);
|
||||
void GPU_lamp_shadow_buffer_unbind(GPULamp *lamp);
|
||||
|
||||
void GPU_lamp_update(GPULamp *lamp, float obmat[][4]);
|
||||
void GPU_lamp_update(GPULamp *lamp, int lay, float obmat[][4]);
|
||||
int GPU_lamp_shadow_layer(GPULamp *lamp);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@ -50,6 +50,8 @@
|
||||
#include "GPU_material.h"
|
||||
#include "GPU_extensions.h"
|
||||
|
||||
#include "BLO_sys_types.h" // for intptr_t support
|
||||
|
||||
#include "gpu_codegen.h"
|
||||
|
||||
#include <string.h>
|
||||
@ -57,7 +59,7 @@
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifndef vsnprintf
|
||||
#define _vsnprintf vsnprintf
|
||||
#define vsnprintf _vsnprintf
|
||||
#endif
|
||||
#ifndef snprintf
|
||||
#define snprintf _snprintf
|
||||
|
||||
@ -900,7 +900,7 @@ int GPU_enable_material(int nr, void *attribs)
|
||||
|
||||
gpumat = GPU_material_from_blender(GMS.gscene, mat);
|
||||
GPU_material_vertex_attributes(gpumat, gattribs);
|
||||
GPU_material_bind(gpumat, GMS.gob->lay, 1.0);
|
||||
GPU_material_bind(gpumat, GMS.gob->lay, G.vd->lay, 1.0);
|
||||
GPU_material_bind_uniforms(gpumat, GMS.gob->obmat, G.vd->viewmat, G.vd->viewinv, GMS.gob->col);
|
||||
GMS.gboundmat= mat;
|
||||
|
||||
|
||||
@ -56,7 +56,6 @@
|
||||
|
||||
#include "BLI_arithb.h"
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BLI_linklist.h"
|
||||
|
||||
#include "GPU_extensions.h"
|
||||
#include "GPU_material.h"
|
||||
@ -95,7 +94,7 @@ struct GPUMaterial {
|
||||
int obmatloc, invobmatloc;
|
||||
int obcolloc;
|
||||
|
||||
LinkNode *lamps;
|
||||
ListBase lamps;
|
||||
};
|
||||
|
||||
struct GPULamp {
|
||||
@ -132,7 +131,7 @@ struct GPULamp {
|
||||
GPUFrameBuffer *fb;
|
||||
GPUTexture *tex;
|
||||
|
||||
LinkNode *materials;
|
||||
ListBase materials;
|
||||
};
|
||||
|
||||
/* Functions */
|
||||
@ -221,6 +220,7 @@ static int GPU_material_construct_end(GPUMaterial *material)
|
||||
void GPU_material_free(Material *ma)
|
||||
{
|
||||
LinkData *link;
|
||||
LinkData *nlink, *mlink, *next;
|
||||
|
||||
for(link=ma->gpumaterial.first; link; link=link->next) {
|
||||
GPUMaterial *material = link->data;
|
||||
@ -228,7 +228,17 @@ void GPU_material_free(Material *ma)
|
||||
if(material->pass)
|
||||
GPU_pass_free(material->pass);
|
||||
|
||||
BLI_linklist_free(material->lamps, NULL);
|
||||
for(nlink=material->lamps.first; nlink; nlink=nlink->next) {
|
||||
GPULamp *lamp = nlink->data;
|
||||
|
||||
for(mlink=lamp->materials.first; mlink; mlink=next) {
|
||||
next = mlink->next;
|
||||
if(mlink->data == ma)
|
||||
BLI_freelinkN(&lamp->materials, mlink);
|
||||
}
|
||||
}
|
||||
|
||||
BLI_freelistN(&material->lamps);
|
||||
|
||||
MEM_freeN(material);
|
||||
}
|
||||
@ -236,17 +246,17 @@ void GPU_material_free(Material *ma)
|
||||
BLI_freelistN(&ma->gpumaterial);
|
||||
}
|
||||
|
||||
void GPU_material_bind(GPUMaterial *material, int lay, double time)
|
||||
void GPU_material_bind(GPUMaterial *material, int oblay, int viewlay, double time)
|
||||
{
|
||||
if(material->pass) {
|
||||
LinkNode *nlink;
|
||||
LinkData *nlink;
|
||||
GPULamp *lamp;
|
||||
|
||||
/* handle layer lamps */
|
||||
for(nlink=material->lamps; nlink; nlink=nlink->next) {
|
||||
lamp= nlink->link;
|
||||
for(nlink=material->lamps.first; nlink; nlink=nlink->next) {
|
||||
lamp= nlink->data;
|
||||
|
||||
if(!(lamp->mode & LA_LAYER) || (lamp->lay & lay)) {
|
||||
if((lamp->lay & viewlay) && (!(lamp->mode & LA_LAYER) || (lamp->lay & oblay))) {
|
||||
lamp->dynenergy = lamp->energy;
|
||||
VECCOPY(lamp->dyncol, lamp->col);
|
||||
}
|
||||
@ -265,7 +275,7 @@ void GPU_material_bind_uniforms(GPUMaterial *material, float obmat[][4], float v
|
||||
{
|
||||
if(material->pass) {
|
||||
GPUShader *shader = GPU_pass_shader(material->pass);
|
||||
LinkNode *nlink;
|
||||
LinkData *nlink;
|
||||
GPULamp *lamp;
|
||||
float invmat[4][4], col[4];
|
||||
|
||||
@ -290,8 +300,8 @@ void GPU_material_bind_uniforms(GPUMaterial *material, float obmat[][4], float v
|
||||
}
|
||||
|
||||
/* update lamps */
|
||||
for(nlink=material->lamps; nlink; nlink=nlink->next) {
|
||||
lamp= nlink->link;
|
||||
for(nlink=material->lamps.first; nlink; nlink=nlink->next) {
|
||||
lamp= nlink->data;
|
||||
|
||||
if(material->dynproperty & DYN_LAMP_VEC) {
|
||||
VECCOPY(lamp->dynvec, lamp->vec);
|
||||
@ -587,6 +597,13 @@ static void do_specular_ramp(GPUShadeInput *shi, GPUNodeLink *is, GPUNodeLink *t
|
||||
}
|
||||
}
|
||||
|
||||
void add_user_list(ListBase *list, void *data)
|
||||
{
|
||||
LinkData *link = MEM_callocN(sizeof(LinkData), "GPULinkData");
|
||||
link->data = data;
|
||||
BLI_addtail(list, link);
|
||||
}
|
||||
|
||||
static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *lamp)
|
||||
{
|
||||
Material *ma= shi->mat;
|
||||
@ -665,11 +682,18 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la
|
||||
|
||||
if(lamp->mode & LA_ONLYSHADOW) {
|
||||
GPU_link(mat, "shade_only_shadow", i, shadfac,
|
||||
GPU_dynamic_uniform(&lamp->dynenergy), shi->rgb, shi->specrgb,
|
||||
shr->diff, shr->spec, &shr->diff, &shr->spec);
|
||||
GPU_dynamic_uniform(&lamp->dynenergy), &shadfac);
|
||||
|
||||
BLI_linklist_append(&mat->lamps, lamp);
|
||||
BLI_linklist_append(&lamp->materials, ma);
|
||||
if(!(lamp->mode & LA_NO_DIFF))
|
||||
GPU_link(mat, "shade_only_shadow_diffuse", shadfac, shi->rgb,
|
||||
shr->diff, &shr->diff);
|
||||
|
||||
if(!(lamp->mode & LA_NO_SPEC))
|
||||
GPU_link(mat, "shade_only_shadow_specular", shadfac, shi->specrgb,
|
||||
shr->spec, &shr->spec);
|
||||
|
||||
add_user_list(&mat->lamps, lamp);
|
||||
add_user_list(&lamp->materials, ma);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -677,8 +701,8 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la
|
||||
}
|
||||
}
|
||||
else if((G.fileflags & G_FILE_GLSL_NO_SHADOWS) && (lamp->mode & LA_ONLYSHADOW)) {
|
||||
BLI_linklist_append(&mat->lamps, lamp);
|
||||
BLI_linklist_append(&lamp->materials, ma);
|
||||
add_user_list(&mat->lamps, lamp);
|
||||
add_user_list(&lamp->materials, ma);
|
||||
return;
|
||||
}
|
||||
else
|
||||
@ -730,8 +754,8 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la
|
||||
}
|
||||
}
|
||||
|
||||
BLI_linklist_append(&mat->lamps, lamp);
|
||||
BLI_linklist_append(&lamp->materials, ma);
|
||||
add_user_list(&mat->lamps, lamp);
|
||||
add_user_list(&lamp->materials, ma);
|
||||
}
|
||||
|
||||
static void material_lights(GPUShadeInput *shi, GPUShadeResult *shr)
|
||||
@ -934,10 +958,15 @@ static void do_material_tex(GPUShadeInput *shi)
|
||||
if(ofs[0] != 0.0f || ofs[1] != 0.0f || ofs[2] != 0.0f)
|
||||
GPU_link(mat, "mtex_mapping_ofs", texco, GPU_uniform(ofs), &texco);
|
||||
|
||||
talpha = 0;
|
||||
rgbnor = 0;
|
||||
|
||||
if(tex && tex->type == TEX_IMAGE && tex->ima) {
|
||||
GPU_link(mat, "mtex_image", texco, GPU_image(tex->ima, NULL), &tin, &trgb, &tnor);
|
||||
rgbnor= TEX_RGB;
|
||||
talpha= 1;
|
||||
|
||||
if(tex->imaflag & TEX_USEALPHA)
|
||||
talpha= 1;
|
||||
}
|
||||
else continue;
|
||||
|
||||
@ -977,8 +1006,10 @@ static void do_material_tex(GPUShadeInput *shi)
|
||||
|
||||
if(mtex->mapto & MAP_ALPHA)
|
||||
GPU_link(mat, "set_value", stencil, &tin);
|
||||
else
|
||||
else if(talpha)
|
||||
GPU_link(mat, "mtex_alpha_from_col", trgb, &tin);
|
||||
else
|
||||
GPU_link(mat, "set_value_one", &tin);
|
||||
}
|
||||
|
||||
if(mtex->mapto & MAP_COL)
|
||||
@ -1258,10 +1289,12 @@ void GPU_materials_free()
|
||||
|
||||
/* Lamps and shadow buffers */
|
||||
|
||||
void GPU_lamp_update(GPULamp *lamp, float obmat[][4])
|
||||
void GPU_lamp_update(GPULamp *lamp, int lay, float obmat[][4])
|
||||
{
|
||||
float mat[4][4];
|
||||
|
||||
lamp->lay = lay;
|
||||
|
||||
Mat4CpyMat4(mat, obmat);
|
||||
Mat4Ortho(mat);
|
||||
|
||||
@ -1279,7 +1312,6 @@ static void gpu_lamp_from_blender(Scene *scene, Object *ob, Object *par, Lamp *l
|
||||
lamp->ob = ob;
|
||||
lamp->par = par;
|
||||
lamp->la = la;
|
||||
lamp->lay = ob->lay;
|
||||
|
||||
/* add_render_lamp */
|
||||
lamp->mode = la->mode;
|
||||
@ -1292,7 +1324,7 @@ static void gpu_lamp_from_blender(Scene *scene, Object *ob, Object *par, Lamp *l
|
||||
lamp->col[1]= la->g*lamp->energy;
|
||||
lamp->col[2]= la->b*lamp->energy;
|
||||
|
||||
GPU_lamp_update(lamp, ob->obmat);
|
||||
GPU_lamp_update(lamp, ob->lay, ob->obmat);
|
||||
|
||||
lamp->spotsi= la->spotsize;
|
||||
if(lamp->mode & LA_HALO)
|
||||
@ -1340,10 +1372,12 @@ GPULamp *GPU_lamp_from_blender(Scene *scene, Object *ob, Object *par)
|
||||
GPULamp *lamp;
|
||||
LinkData *link;
|
||||
|
||||
for(link=ob->gpulamp.first; link; link=link->next)
|
||||
if(((GPULamp*)link->data)->par == par &&
|
||||
((GPULamp*)link->data)->scene == scene)
|
||||
for(link=ob->gpulamp.first; link; link=link->next) {
|
||||
lamp = (GPULamp*)link->data;
|
||||
|
||||
if(lamp->par == par && lamp->scene == scene)
|
||||
return link->data;
|
||||
}
|
||||
|
||||
lamp = MEM_callocN(sizeof(GPULamp), "GPULamp");
|
||||
|
||||
@ -1383,18 +1417,20 @@ void GPU_lamp_free(Object *ob)
|
||||
{
|
||||
GPULamp *lamp;
|
||||
LinkData *link;
|
||||
LinkNode *nlink;
|
||||
LinkData *nlink;
|
||||
Material *ma;
|
||||
|
||||
for(link=ob->gpulamp.first; link; link=link->next) {
|
||||
lamp = link->data;
|
||||
|
||||
for(nlink=lamp->materials; nlink; nlink=nlink->next) {
|
||||
ma= nlink->link;
|
||||
while(lamp->materials.first) {
|
||||
nlink = lamp->materials.first;
|
||||
ma = nlink->data;
|
||||
BLI_freelinkN(&lamp->materials, nlink);
|
||||
|
||||
if(ma->gpumaterial.first)
|
||||
GPU_material_free(ma);
|
||||
}
|
||||
BLI_linklist_free(lamp->materials, NULL);
|
||||
|
||||
gpu_lamp_shadow_free(lamp);
|
||||
|
||||
|
||||
@ -311,6 +311,11 @@ void set_value_zero(out float outval)
|
||||
outval = 0.0;
|
||||
}
|
||||
|
||||
void set_value_one(out float outval)
|
||||
{
|
||||
outval = 1.0;
|
||||
}
|
||||
|
||||
void set_rgb_zero(out vec3 outval)
|
||||
{
|
||||
outval = vec3(0.0);
|
||||
@ -1392,7 +1397,7 @@ void shade_blinn_spec(vec3 n, vec3 l, vec3 v, float refrac, float spec_power, ou
|
||||
float b = (2.0*nh*nv)/vh;
|
||||
float c = (2.0*nh*nl)/vh;
|
||||
|
||||
float g;
|
||||
float g = 0.0;
|
||||
|
||||
if(a < b && a < c) g = a;
|
||||
else if(b < a && b < c) g = b;
|
||||
@ -1483,11 +1488,18 @@ void ramp_rgbtobw(vec3 color, out float outval)
|
||||
outval = color.r*0.3 + color.g*0.58 + color.b*0.12;
|
||||
}
|
||||
|
||||
void shade_only_shadow(float i, float shadfac, float energy, vec3 rgb, vec3 specrgb, vec4 diff, vec4 spec, out vec4 outdiff, out vec4 outspec)
|
||||
void shade_only_shadow(float i, float shadfac, float energy, out float outshadfac)
|
||||
{
|
||||
shadfac = i*energy*(1.0 - shadfac);
|
||||
outshadfac = i*energy*(1.0 - shadfac);
|
||||
}
|
||||
|
||||
void shade_only_shadow_diffuse(float shadfac, vec3 rgb, vec4 diff, out vec4 outdiff)
|
||||
{
|
||||
outdiff = diff - vec4(rgb*shadfac, 0.0);
|
||||
}
|
||||
|
||||
void shade_only_shadow_specular(float shadfac, vec3 specrgb, vec4 spec, out vec4 outspec)
|
||||
{
|
||||
outspec = spec - vec4(specrgb*shadfac, 0.0);
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -33,6 +33,8 @@
|
||||
struct ScrArea;
|
||||
struct Sequence;
|
||||
|
||||
#define SEQ_ZOOM_FAC(szoom) (szoom > 0)? (szoom) : (szoom == 0)? (1.0) : (-1.0/szoom)
|
||||
|
||||
void drawprefetchseqspace(struct ScrArea *sa, void *spacedata);
|
||||
void drawseqspace(struct ScrArea *sa, void *spacedata);
|
||||
void set_special_seq_update(int val);
|
||||
|
||||
@ -47,7 +47,7 @@ struct EditMesh;
|
||||
struct LaplacianSystem;
|
||||
typedef struct LaplacianSystem LaplacianSystem;
|
||||
|
||||
LaplacianSystem *laplacian_construct_begin(int totvert, int totface);
|
||||
LaplacianSystem *laplacian_construct_begin(int totvert, int totface, int lsq);
|
||||
|
||||
void laplacian_add_vertex(LaplacianSystem *sys, float *co, int pinned);
|
||||
void laplacian_add_triangle(LaplacianSystem *sys, int v1, int v2, int v3);
|
||||
|
||||
@ -266,8 +266,8 @@ typedef enum {
|
||||
ICON_WINDOW_WINDOW,
|
||||
ICON_PANEL_CLOSE,
|
||||
ICON_PHYSICS,
|
||||
ICON_BLANK36,
|
||||
ICON_BLANK37,
|
||||
ICON_LAYER_USED,
|
||||
ICON_LAYER_ACTIVE,
|
||||
ICON_BLANK38,
|
||||
|
||||
ICON_BLENDER,
|
||||
|
||||
@ -65,6 +65,7 @@ struct SpaceOops;
|
||||
#define IMAGE_HANDLER_PREVIEW 33
|
||||
#define IMAGE_HANDLER_GAME_PROPERTIES 34
|
||||
#define IMAGE_HANDLER_VIEW_PROPERTIES 35
|
||||
#define IMAGE_HANDLER_GREASEPENCIL 36
|
||||
/*#define IMAGE_HANDLER_TRANSFORM_PROPERTIES 36*/
|
||||
|
||||
/* action handler codes */
|
||||
|
||||
@ -241,6 +241,7 @@
|
||||
#define B_SEL_END 168
|
||||
#define B_MAN_MODE 169
|
||||
#define B_NDOF 170
|
||||
#define B_VIEW_BUTSEDIT 171
|
||||
|
||||
/* IPO: 200 */
|
||||
#define B_IPOHOME 201
|
||||
|
||||
@ -193,7 +193,8 @@ typedef struct bGameActuator {
|
||||
} bGameActuator;
|
||||
|
||||
typedef struct bVisibilityActuator {
|
||||
/** bit 0: Is this object visible? */
|
||||
/** bit 0: Is this object visible?
|
||||
** bit 1: Apply recursively */
|
||||
int flag;
|
||||
} bVisibilityActuator;
|
||||
|
||||
@ -448,6 +449,7 @@ typedef struct FreeCamera {
|
||||
/* visibilityact->flag */
|
||||
/* Set means the object will become invisible */
|
||||
#define ACT_VISIBILITY_INVISIBLE (1 << 0)
|
||||
#define ACT_VISIBILITY_RECURSIVE (1 << 1)
|
||||
|
||||
/* twodfilter->type */
|
||||
#define ACT_2DFILTER_ENABLED -2
|
||||
|
||||
@ -142,24 +142,24 @@ typedef short IPO_Channel;
|
||||
#define MA_FRESTRAI 25
|
||||
#define MA_ADD 26
|
||||
|
||||
#define MA_MAP1 1<<5
|
||||
#define MA_MAP2 1<<6
|
||||
#define MA_MAP3 1<<7
|
||||
#define MA_MAP4 1<<8
|
||||
#define MA_MAP5 1<<9
|
||||
#define MA_MAP6 1<<10
|
||||
#define MA_MAP7 1<<11
|
||||
#define MA_MAP8 1<<12
|
||||
#define MA_MAP9 1<<13
|
||||
#define MA_MAP10 1<<14
|
||||
#define MA_MAP11 1<<15
|
||||
#define MA_MAP12 1<<16
|
||||
#define MA_MAP13 1<<17
|
||||
#define MA_MAP14 1<<18
|
||||
#define MA_MAP15 1<<19
|
||||
#define MA_MAP16 1<<20
|
||||
#define MA_MAP17 1<<21
|
||||
#define MA_MAP18 1<<22
|
||||
#define MA_MAP1 (1<<5)
|
||||
#define MA_MAP2 (1<<6)
|
||||
#define MA_MAP3 (1<<7)
|
||||
#define MA_MAP4 (1<<8)
|
||||
#define MA_MAP5 (1<<9)
|
||||
#define MA_MAP6 (1<<10)
|
||||
#define MA_MAP7 (1<<11)
|
||||
#define MA_MAP8 (1<<12)
|
||||
#define MA_MAP9 (1<<13)
|
||||
#define MA_MAP10 (1<<14)
|
||||
#define MA_MAP11 (1<<15)
|
||||
#define MA_MAP12 (1<<16)
|
||||
#define MA_MAP13 (1<<17)
|
||||
#define MA_MAP14 (1<<18)
|
||||
#define MA_MAP15 (1<<19)
|
||||
#define MA_MAP16 (1<<20)
|
||||
#define MA_MAP17 (1<<21)
|
||||
#define MA_MAP18 (1<<22)
|
||||
|
||||
#define TEX_TOTNAM 14
|
||||
|
||||
|
||||
@ -790,6 +790,7 @@ typedef struct Scene {
|
||||
/* toolsettings->uvcalc_flag */
|
||||
#define UVCALC_FILLHOLES 1
|
||||
#define UVCALC_NO_ASPECT_CORRECT 2 /* would call this UVCALC_ASPECT_CORRECT, except it should be default with old file */
|
||||
#define UVCALC_TRANSFORM_CORRECT 4 /* adjust UV's while transforming to avoid distortion */
|
||||
|
||||
/* toolsettings->edge_mode */
|
||||
#define EDGE_MODE_SELECT 0
|
||||
|
||||
@ -538,6 +538,7 @@ typedef struct SpaceImaSel {
|
||||
#define SI_DRAW_TILE 1<<19
|
||||
#define SI_SMOOTH_UV 1<<20
|
||||
#define SI_DRAW_STRETCH 1<<21
|
||||
#define SI_DISPGP 1<<22
|
||||
|
||||
/* SpaceIpo->flag */
|
||||
#define SIPO_LOCK_VIEW 1<<0
|
||||
|
||||
@ -268,6 +268,7 @@ extern UserDef U; /* from usiblender.c !!!! */
|
||||
#define USER_GLOBALUNDO (1 << 13)
|
||||
#define USER_ORBIT_SELECTION (1 << 14)
|
||||
// old flag for #define USER_KEYINSERTAVAI (1 << 15)
|
||||
#define USER_ORBIT_ZBUF (1 << 15)
|
||||
#define USER_HIDE_DOT (1 << 16)
|
||||
#define USER_SHOW_ROTVIEWICON (1 << 17)
|
||||
#define USER_SHOW_VIEWPORTNAME (1 << 18)
|
||||
|
||||
@ -86,7 +86,8 @@ typedef struct View3D {
|
||||
float winmat1[4][4]; // persp(1) storage, for swap matrices
|
||||
float viewmat1[4][4];
|
||||
|
||||
float viewquat[4], dist, zfac, pad0; /* zfac is initgrabz() result */
|
||||
float viewquat[4], dist, zfac; /* zfac is initgrabz() result */
|
||||
int lay_used; /* used while drawing */
|
||||
|
||||
short persp;
|
||||
short view;
|
||||
|
||||
@ -130,13 +130,16 @@ static void node_composit_exec_tonemap(void *data, bNode *node, bNodeStack **in,
|
||||
if ((img==NULL) || (out[0]->hasoutput==0)) return;
|
||||
|
||||
if (img->type != CB_RGBA)
|
||||
new = typecheck_compbuf(img, CB_RGBA);
|
||||
else
|
||||
new = dupalloc_compbuf(img);
|
||||
img = typecheck_compbuf(img, CB_RGBA);
|
||||
|
||||
new = dupalloc_compbuf(img);
|
||||
|
||||
tonemap(node->storage, new, img);
|
||||
|
||||
out[0]->data = new;
|
||||
|
||||
if(img!=in[0]->data)
|
||||
free_compbuf(img);
|
||||
}
|
||||
|
||||
static void node_composit_init_tonemap(bNode* node)
|
||||
|
||||
@ -778,9 +778,6 @@ int BPY_run_script(Script *script)
|
||||
PyObject *py_dict, *py_res, *pyarg;
|
||||
Text *text = NULL;
|
||||
BPy_constant *info;
|
||||
int len;
|
||||
|
||||
FILE *fp = NULL;
|
||||
|
||||
PyGILState_STATE gilstate = PyGILState_Ensure();
|
||||
|
||||
@ -825,12 +822,8 @@ int BPY_run_script(Script *script)
|
||||
Py_INCREF( Py_None );
|
||||
pyarg = Py_None;
|
||||
} else {
|
||||
if (BLI_exists(script->scriptname)) {
|
||||
fp = fopen( script->scriptname, "rb" );
|
||||
}
|
||||
|
||||
if( !fp ) {
|
||||
printf( "Error loading script: couldn't open file %s\n", script->scriptname );
|
||||
if (!BLI_exists(script->scriptname)) {
|
||||
printf( "Script does not exit %s\n", script->scriptname );
|
||||
free_libblock( &G.main->script, script );
|
||||
PyGILState_Release(gilstate);
|
||||
return 0;
|
||||
@ -875,51 +868,17 @@ int BPY_run_script(Script *script)
|
||||
if (text) {
|
||||
py_res = RunPython( text, py_dict );
|
||||
} else {
|
||||
char pystring[sizeof(script->scriptname) + 15];
|
||||
sprintf(pystring, "execfile(r'%s')", script->scriptname);
|
||||
py_res = PyRun_String( pystring, Py_file_input, py_dict, py_dict );
|
||||
}
|
||||
|
||||
if( !py_res ) { /* Failed execution of the script */
|
||||
/* Previously we used PyRun_File to run directly the code on a FILE
|
||||
* object, but as written in the Python/C API Ref Manual, chapter 2,
|
||||
* 'FILE structs for different C libraries can be different and
|
||||
* incompatible'.
|
||||
* So now we load the script file data to a buffer */
|
||||
char *buffer=NULL, *buffer_ofs=NULL, *b_to, *b_from;
|
||||
|
||||
fseek( fp, 0L, SEEK_END );
|
||||
len = ftell( fp );
|
||||
fseek( fp, 0L, SEEK_SET );
|
||||
|
||||
buffer = buffer_ofs = MEM_mallocN( len + 2, "pyfilebuf" ); /* len+2 to add '\n\0' */
|
||||
len = fread( buffer, 1, len, fp );
|
||||
|
||||
buffer[len] = '\n'; /* fix syntax error in files w/o eol */
|
||||
buffer[len + 1] = '\0';
|
||||
|
||||
|
||||
/* fast clean-up of dos cr/lf line endings, remove convert '\r\n's to '\n' */
|
||||
if (*buffer_ofs == '\r' && *(buffer_ofs+1) == '\n') {
|
||||
buffer_ofs++;
|
||||
}
|
||||
b_from = b_to = buffer_ofs;
|
||||
|
||||
while(*b_from != '\0') {
|
||||
if (*b_from == '\r' && *( b_from+1 ) == '\n') {
|
||||
b_from++;
|
||||
}
|
||||
if (b_from != b_to) {
|
||||
*b_to = *b_from;
|
||||
}
|
||||
b_to++;
|
||||
b_from++;
|
||||
}
|
||||
*b_to = '\0';
|
||||
/* done cleaning the string */
|
||||
|
||||
fclose( fp );
|
||||
|
||||
py_res = PyRun_String( buffer_ofs, Py_file_input, py_dict, py_dict );
|
||||
MEM_freeN( buffer );
|
||||
}
|
||||
|
||||
if( !py_res ) { /* Failed execution of the script */
|
||||
|
||||
BPY_Err_Handle( script->id.name + 2 );
|
||||
ReleaseGlobalDictionary( py_dict );
|
||||
script->py_globaldict = NULL;
|
||||
|
||||
@ -39,6 +39,7 @@
|
||||
#include "BSE_editipo.h"
|
||||
#include "mydevice.h"
|
||||
#include "Ipo.h"
|
||||
#include "MTex.h"
|
||||
#include "constant.h"
|
||||
#include "gen_utils.h"
|
||||
#include "gen_library.h"
|
||||
@ -206,6 +207,7 @@ static PyObject *Lamp_getQuad2( BPy_Lamp * self );
|
||||
static PyObject *Lamp_getCol( BPy_Lamp * self );
|
||||
static PyObject *Lamp_getIpo( BPy_Lamp * self );
|
||||
static PyObject *Lamp_getComponent( BPy_Lamp * self, void * closure );
|
||||
static PyObject *Lamp_getTextures( BPy_Lamp * self );
|
||||
static PyObject *Lamp_clearIpo( BPy_Lamp * self );
|
||||
static PyObject *Lamp_insertIpoKey( BPy_Lamp * self, PyObject * args );
|
||||
static PyObject *Lamp_oldsetIpo( BPy_Lamp * self, PyObject * args );
|
||||
@ -500,6 +502,10 @@ static PyGetSetDef BPy_Lamp_getseters[] = {
|
||||
(getter)Lamp_getComponent, (setter)Lamp_setComponent,
|
||||
"Lamp color blue component",
|
||||
(void *)EXPP_LAMP_COMP_B},
|
||||
{"textures",
|
||||
(getter)Lamp_getTextures, (setter)NULL,
|
||||
"The Lamp's texture list as a tuple",
|
||||
NULL},
|
||||
{"Modes",
|
||||
(getter)Lamp_getModesConst, (setter)NULL,
|
||||
"Dictionary of values for 'mode' attribute",
|
||||
@ -1393,6 +1399,30 @@ static PyObject *Lamp_getTypesConst( void )
|
||||
"Photon", EXPP_LAMP_TYPE_YF_PHOTON );
|
||||
}
|
||||
|
||||
static PyObject *Lamp_getTextures( BPy_Lamp * self )
|
||||
{
|
||||
int i;
|
||||
PyObject *tuple;
|
||||
|
||||
/* build a texture list */
|
||||
tuple = PyTuple_New( MAX_MTEX );
|
||||
if( !tuple )
|
||||
return EXPP_ReturnPyObjError( PyExc_MemoryError,
|
||||
"couldn't create PyTuple" );
|
||||
|
||||
for( i = 0; i < MAX_MTEX; ++i ) {
|
||||
struct MTex *mtex = self->lamp->mtex[i];
|
||||
if( mtex ) {
|
||||
PyTuple_SET_ITEM( tuple, i, MTex_CreatePyObject( mtex, ID_LA ) );
|
||||
} else {
|
||||
Py_INCREF( Py_None );
|
||||
PyTuple_SET_ITEM( tuple, i, Py_None );
|
||||
}
|
||||
}
|
||||
|
||||
return tuple;
|
||||
}
|
||||
|
||||
/* #####DEPRECATED###### */
|
||||
|
||||
static PyObject *Lamp_oldsetSamples( BPy_Lamp * self, PyObject * args )
|
||||
|
||||
@ -26,6 +26,7 @@
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#include "MTex.h" /*This must come first*/
|
||||
|
||||
#include "BKE_utildefines.h"
|
||||
@ -252,7 +253,7 @@ PyObject *MTex_Init( void )
|
||||
return submodule;
|
||||
}
|
||||
|
||||
PyObject *MTex_CreatePyObject( MTex * mtex )
|
||||
PyObject *MTex_CreatePyObject( MTex * mtex, unsigned short type )
|
||||
{
|
||||
BPy_MTex *pymtex;
|
||||
|
||||
@ -262,6 +263,7 @@ PyObject *MTex_CreatePyObject( MTex * mtex )
|
||||
"couldn't create BPy_MTex PyObject" );
|
||||
|
||||
pymtex->mtex = mtex;
|
||||
pymtex->type = type;
|
||||
return ( PyObject * ) pymtex;
|
||||
}
|
||||
|
||||
@ -286,7 +288,12 @@ static int MTex_compare( BPy_MTex * a, BPy_MTex * b )
|
||||
|
||||
static PyObject *MTex_repr( BPy_MTex * self )
|
||||
{
|
||||
return PyString_FromFormat( "[MTex]" );
|
||||
if( self->type == ID_MA )
|
||||
return PyString_FromFormat( "[MTex (Material)]" );
|
||||
else if( self->type == ID_LA )
|
||||
return PyString_FromFormat( "[MTex (Lamp)]" );
|
||||
else
|
||||
return PyString_FromFormat( "[MTex (World)]" );
|
||||
}
|
||||
|
||||
|
||||
@ -350,6 +357,10 @@ static int MTex_setObject( BPy_MTex *self, PyObject *value, void *closure)
|
||||
|
||||
static PyObject *MTex_getUVLayer( BPy_MTex *self, void *closure )
|
||||
{
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnPyObjError( PyExc_AttributeError,
|
||||
"not a Material MTex object" );
|
||||
|
||||
return PyString_FromString(self->mtex->uvname);
|
||||
}
|
||||
|
||||
@ -364,6 +375,10 @@ static int MTex_setUVLayer( BPy_MTex *self, PyObject *value, void *closure)
|
||||
|
||||
static PyObject *MTex_getMapTo( BPy_MTex *self, void *closure )
|
||||
{
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnPyObjError( PyExc_AttributeError,
|
||||
"not a Material MTex object" );
|
||||
|
||||
return PyInt_FromLong( self->mtex->mapto );
|
||||
}
|
||||
|
||||
@ -371,18 +386,20 @@ static int MTex_setMapTo( BPy_MTex *self, PyObject *value, void *closure)
|
||||
{
|
||||
int mapto;
|
||||
|
||||
if( !PyInt_Check( value ) ) {
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnIntError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
if( !PyInt_Check( value ) )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected an int" );
|
||||
}
|
||||
"expected an int" );
|
||||
|
||||
mapto = PyInt_AsLong( value );
|
||||
|
||||
/* This method is deprecated anyway. */
|
||||
if ( mapto < 0 || mapto > 16383 ) {
|
||||
if ( mapto < 0 || mapto > 16383 )
|
||||
return EXPP_ReturnIntError( PyExc_ValueError,
|
||||
"Value must be a sum of values from Texture.MapTo dictionary" );
|
||||
}
|
||||
|
||||
self->mtex->mapto = (short)mapto;
|
||||
|
||||
@ -400,11 +417,9 @@ static int MTex_setCol( BPy_MTex *self, PyObject *value, void *closure)
|
||||
float rgb[3];
|
||||
int i;
|
||||
|
||||
if( !PyArg_ParseTuple( value, "fff",
|
||||
&rgb[0], &rgb[1], &rgb[2] ) )
|
||||
|
||||
if( !PyArg_ParseTuple( value, "fff", &rgb[0], &rgb[1], &rgb[2] ) )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected tuple of 3 floats" );
|
||||
"expected tuple of 3 floats" );
|
||||
|
||||
for( i = 0; i < 3; ++i )
|
||||
if( rgb[i] < 0 || rgb[i] > 1 )
|
||||
@ -478,117 +493,84 @@ static PyObject *MTex_getColFac( BPy_MTex *self, void *closure )
|
||||
|
||||
static int MTex_setColFac( BPy_MTex *self, PyObject *value, void *closure)
|
||||
{
|
||||
float f;
|
||||
|
||||
if ( !PyFloat_Check( value ) )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected a float" );
|
||||
|
||||
f = (float)PyFloat_AsDouble(value);
|
||||
|
||||
if (f < 0 || f > 1)
|
||||
return EXPP_ReturnIntError( PyExc_ValueError,
|
||||
"values must be in range [0,1]" );
|
||||
|
||||
self->mtex->colfac = f;
|
||||
|
||||
return 0;
|
||||
return EXPP_setFloatRange( value, &self->mtex->colfac, 0.0f, 1.0f );
|
||||
}
|
||||
|
||||
static PyObject *MTex_getNorFac( BPy_MTex *self, void *closure )
|
||||
{
|
||||
if( self->type == ID_LA )
|
||||
return EXPP_ReturnPyObjError( PyExc_AttributeError,
|
||||
"not a material or world MTex object" );
|
||||
|
||||
return PyFloat_FromDouble(self->mtex->norfac);
|
||||
}
|
||||
|
||||
static int MTex_setNorFac( BPy_MTex *self, PyObject *value, void *closure)
|
||||
{
|
||||
float f;
|
||||
|
||||
if ( !PyFloat_Check( value ) )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected a float" );
|
||||
|
||||
f = (float)PyFloat_AsDouble(value);
|
||||
|
||||
if (f < 0 || f > 25)
|
||||
return EXPP_ReturnIntError( PyExc_ValueError,
|
||||
"values must be in range [0,25]" );
|
||||
|
||||
self->mtex->norfac = f;
|
||||
|
||||
return 0;
|
||||
switch( self->type )
|
||||
{
|
||||
case ID_WO:
|
||||
return EXPP_setFloatRange( value, &self->mtex->norfac, 0.0f, 1.0f );
|
||||
case ID_MA:
|
||||
return EXPP_setFloatRange( value, &self->mtex->norfac, 0.0f, 25.0f );
|
||||
default:
|
||||
return EXPP_ReturnIntError( PyExc_AttributeError,
|
||||
"not a material or world MTex object" );
|
||||
}
|
||||
}
|
||||
|
||||
static PyObject *MTex_getVarFac( BPy_MTex *self, void *closure )
|
||||
{
|
||||
if( self->type == ID_LA )
|
||||
return EXPP_ReturnPyObjError( PyExc_AttributeError,
|
||||
"not a material or world MTex object" );
|
||||
|
||||
return PyFloat_FromDouble(self->mtex->varfac);
|
||||
}
|
||||
|
||||
static int MTex_setVarFac( BPy_MTex *self, PyObject *value, void *closure)
|
||||
{
|
||||
float f;
|
||||
if( self->type == ID_LA )
|
||||
return EXPP_ReturnIntError( PyExc_AttributeError,
|
||||
"not a material or world MTex object" );
|
||||
|
||||
if ( !PyFloat_Check( value ) )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected a float" );
|
||||
|
||||
f = (float)PyFloat_AsDouble(value);
|
||||
|
||||
if (f < 0 || f > 1)
|
||||
return EXPP_ReturnIntError( PyExc_ValueError,
|
||||
"values must be in range [0,1]" );
|
||||
|
||||
self->mtex->varfac = f;
|
||||
|
||||
return 0;
|
||||
return EXPP_setFloatRange( value, &self->mtex->varfac, 0.0f, 1.0f );
|
||||
}
|
||||
|
||||
static PyObject *MTex_getDispFac( BPy_MTex *self, void *closure )
|
||||
{
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnPyObjError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
return PyFloat_FromDouble(self->mtex->dispfac);
|
||||
}
|
||||
|
||||
static int MTex_setDispFac( BPy_MTex *self, PyObject *value, void *closure)
|
||||
{
|
||||
float f;
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnIntError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
if ( !PyFloat_Check( value ) )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected a float" );
|
||||
|
||||
f = (float)PyFloat_AsDouble(value);
|
||||
|
||||
if (f < 0 || f > 1)
|
||||
return EXPP_ReturnIntError( PyExc_ValueError,
|
||||
"values must be in range [0,1]" );
|
||||
|
||||
self->mtex->dispfac = f;
|
||||
|
||||
return 0;
|
||||
return EXPP_setFloatRange( value, &self->mtex->dispfac, 0.0f, 1.0f );
|
||||
}
|
||||
|
||||
static PyObject *MTex_getWarpFac( BPy_MTex *self, void *closure )
|
||||
{
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnPyObjError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
return PyFloat_FromDouble(self->mtex->warpfac);
|
||||
}
|
||||
|
||||
static int MTex_setWarpFac( BPy_MTex *self, PyObject *value, void *closure)
|
||||
{
|
||||
float f;
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnIntError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
if ( !PyFloat_Check( value ) )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected a float" );
|
||||
|
||||
f = (float)PyFloat_AsDouble(value);
|
||||
|
||||
if (f < 0 || f > 1)
|
||||
return EXPP_ReturnIntError( PyExc_ValueError,
|
||||
"values must be in range [0,1]" );
|
||||
|
||||
self->mtex->warpfac = f;
|
||||
|
||||
return 0;
|
||||
return EXPP_setFloatRange( value, &self->mtex->warpfac, 0.0f, 1.0f );
|
||||
}
|
||||
|
||||
static PyObject *MTex_getOfs( BPy_MTex *self, void *closure )
|
||||
@ -601,16 +583,24 @@ static int MTex_setOfs( BPy_MTex *self, PyObject *value, void *closure)
|
||||
{
|
||||
float f[3];
|
||||
int i;
|
||||
float max;
|
||||
|
||||
if( !PyArg_ParseTuple( value, "fff", &f[0], &f[1], &f[2] ) )
|
||||
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected tuple of 3 floats" );
|
||||
|
||||
if( self->type == ID_MA )
|
||||
max = 10.0f;
|
||||
else
|
||||
max = 20.0f;
|
||||
|
||||
for( i = 0; i < 3; ++i )
|
||||
if( f[i] < -10 || f[i] > 10 )
|
||||
return EXPP_ReturnIntError( PyExc_ValueError,
|
||||
"values must be in range [-10,10]" );
|
||||
if( f[i] < -max || f[i] > max ) {
|
||||
char errstr[64];
|
||||
sprintf( errstr, "values must be in range [-%6.0f,%6.0f]",
|
||||
max, max );
|
||||
return EXPP_ReturnIntError( PyExc_ValueError, errstr );
|
||||
}
|
||||
|
||||
self->mtex->ofs[0] = f[0];
|
||||
self->mtex->ofs[1] = f[1];
|
||||
@ -649,6 +639,10 @@ static int MTex_setSize( BPy_MTex *self, PyObject *value, void *closure)
|
||||
|
||||
static PyObject *MTex_getMapping( BPy_MTex *self, void *closure )
|
||||
{
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnPyObjError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
return PyInt_FromLong( self->mtex->mapping );
|
||||
}
|
||||
|
||||
@ -656,6 +650,11 @@ static int MTex_setMapping( BPy_MTex *self, PyObject *value, void *closure)
|
||||
{
|
||||
int n;
|
||||
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnIntError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
|
||||
if ( !PyInt_Check( value ) )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"Value must be member of Texture.Mappings dictionary" );
|
||||
@ -664,8 +663,7 @@ static int MTex_setMapping( BPy_MTex *self, PyObject *value, void *closure)
|
||||
|
||||
/* if (n != MTEX_FLAT && n != MTEX_TUBE && n != MTEX_CUBE &&
|
||||
n != MTEX_SPHERE) */
|
||||
if (n < 0 || n > 3)
|
||||
{
|
||||
if (n < 0 || n > 3) {
|
||||
return EXPP_ReturnIntError( PyExc_ValueError,
|
||||
"Value must be member of Texture.Mappings dictionary" );
|
||||
}
|
||||
@ -696,6 +694,10 @@ static int MTex_setFlag( BPy_MTex *self, PyObject *value, void *closure)
|
||||
|
||||
static PyObject *MTex_getProjX( BPy_MTex *self, void *closure )
|
||||
{
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnPyObjError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
return PyInt_FromLong( self->mtex->projx );
|
||||
}
|
||||
|
||||
@ -703,6 +705,10 @@ static int MTex_setProjX( BPy_MTex *self, PyObject *value, void *closure)
|
||||
{
|
||||
int proj;
|
||||
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnIntError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
if( !PyInt_Check( value ) ) {
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"Value must be a member of Texture.Proj dictionary" );
|
||||
@ -722,6 +728,10 @@ static int MTex_setProjX( BPy_MTex *self, PyObject *value, void *closure)
|
||||
|
||||
static PyObject *MTex_getProjY( BPy_MTex *self, void *closure )
|
||||
{
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnPyObjError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
return PyInt_FromLong( self->mtex->projy );
|
||||
}
|
||||
|
||||
@ -729,6 +739,10 @@ static int MTex_setProjY( BPy_MTex *self, PyObject *value, void *closure )
|
||||
{
|
||||
int proj;
|
||||
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnIntError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
if( !PyInt_Check( value ) ) {
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"Value must be a member of Texture.Proj dictionary" );
|
||||
@ -748,6 +762,10 @@ static int MTex_setProjY( BPy_MTex *self, PyObject *value, void *closure )
|
||||
|
||||
static PyObject *MTex_getProjZ( BPy_MTex *self, void *closure )
|
||||
{
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnPyObjError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
return PyInt_FromLong( self->mtex->projz );
|
||||
}
|
||||
|
||||
@ -755,6 +773,10 @@ static int MTex_setProjZ( BPy_MTex *self, PyObject *value, void *closure)
|
||||
{
|
||||
int proj;
|
||||
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnIntError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
if( !PyInt_Check( value ) ) {
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"Value must be a member of Texture.Proj dictionary" );
|
||||
@ -776,12 +798,14 @@ static PyObject *MTex_getMapToFlag( BPy_MTex *self, void *closure )
|
||||
{
|
||||
int flag = GET_INT_FROM_POINTER(closure);
|
||||
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnPyObjError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
if ( self->mtex->mapto & flag )
|
||||
{
|
||||
return PyInt_FromLong( ( self->mtex->maptoneg & flag ) ? -1 : 1 );
|
||||
} else {
|
||||
else
|
||||
return PyInt_FromLong( 0 );
|
||||
}
|
||||
}
|
||||
|
||||
static int MTex_setMapToFlag( BPy_MTex *self, PyObject *value, void *closure)
|
||||
@ -789,14 +813,17 @@ static int MTex_setMapToFlag( BPy_MTex *self, PyObject *value, void *closure)
|
||||
int flag = GET_INT_FROM_POINTER(closure);
|
||||
int intVal;
|
||||
|
||||
if( self->type != ID_MA )
|
||||
return EXPP_ReturnIntError( PyExc_AttributeError,
|
||||
"not a material MTex object" );
|
||||
|
||||
if ( !PyInt_Check( value ) )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected an int");
|
||||
|
||||
intVal = PyInt_AsLong( value );
|
||||
intVal = PyInt_AsLong( value ) ;
|
||||
|
||||
if (flag == MAP_COL || flag == MAP_COLSPEC || flag == MAP_COLMIR ||
|
||||
flag == MAP_WARP) {
|
||||
if( flag & ( MAP_COL | MAP_COLSPEC | MAP_COLMIR | MAP_WARP ) ) {
|
||||
if (intVal < 0 || intVal > 1) {
|
||||
return EXPP_ReturnIntError( PyExc_ValueError,
|
||||
"value for that mapping must be 0 or 1" );
|
||||
|
||||
@ -38,22 +38,26 @@
|
||||
/* Python BPy_MTex structure definition */
|
||||
/*****************************************************************************/
|
||||
|
||||
#define MATERIAL_MTEX_TYPE 1
|
||||
#define WORLD_MTEX_TYPE 2
|
||||
#define LAMP_MTEX_TYPE 3
|
||||
|
||||
typedef struct {
|
||||
PyObject_HEAD
|
||||
MTex * mtex;
|
||||
unsigned short type;
|
||||
} BPy_MTex;
|
||||
|
||||
extern PyTypeObject MTex_Type;
|
||||
|
||||
#define BPy_MTex_Check(v) ((v)->ob_type == &MTex_Type)
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Module Blender.Texture.MTex - public functions */
|
||||
/*****************************************************************************/
|
||||
|
||||
PyObject *MTex_Init( void );
|
||||
PyObject *MTex_CreatePyObject( struct MTex *obj );
|
||||
PyObject *MTex_CreatePyObject( struct MTex *obj, unsigned short type );
|
||||
MTex *MTex_FromPyObject( PyObject * py_obj );
|
||||
|
||||
|
||||
|
||||
@ -555,6 +555,7 @@ static int Material_setSssFront( BPy_Material * self, PyObject * value );
|
||||
static int Material_setSssBack( BPy_Material * self, PyObject * value );
|
||||
static int Material_setSssBack( BPy_Material * self, PyObject * value );
|
||||
static int Material_setTexChannel( BPy_Material * self, PyObject * value );
|
||||
static int Material_setTextures( BPy_Material * self, PyObject * value );
|
||||
|
||||
static PyObject *Material_getColorComponent( BPy_Material * self,
|
||||
void * closure );
|
||||
@ -1168,6 +1169,10 @@ static PyGetSetDef BPy_Material_getseters[] = {
|
||||
(getter)Material_getColorband, (setter)Material_setColorband,
|
||||
"The specular colorband for this material",
|
||||
(void *) 1},
|
||||
{"textures",
|
||||
(getter)Material_getTextures, (setter)Material_setTextures,
|
||||
"The Material's texture list as a tuple",
|
||||
NULL},
|
||||
|
||||
/* SSS settings */
|
||||
{"enableSSS",
|
||||
@ -1737,27 +1742,23 @@ static PyObject* Material_getSssBack( BPy_Material * self )
|
||||
static PyObject *Material_getTextures( BPy_Material * self )
|
||||
{
|
||||
int i;
|
||||
struct MTex *mtex;
|
||||
PyObject *t[MAX_MTEX];
|
||||
PyObject *tuple;
|
||||
|
||||
/* build a texture list */
|
||||
for( i = 0; i < MAX_MTEX; ++i ) {
|
||||
mtex = self->material->mtex[i];
|
||||
|
||||
if( mtex ) {
|
||||
t[i] = MTex_CreatePyObject( mtex );
|
||||
} else {
|
||||
Py_INCREF( Py_None );
|
||||
t[i] = Py_None;
|
||||
}
|
||||
}
|
||||
|
||||
/* turn the array into a tuple */
|
||||
tuple = Py_BuildValue( "NNNNNNNNNNNNNNNNNN", t[0], t[1], t[2], t[3], t[4], t[5], t[6], t[7], t[8], t[9], t[10], t[11], t[12], t[13], t[14], t[15], t[16], t[17] );
|
||||
tuple = PyTuple_New( MAX_MTEX );
|
||||
if( !tuple )
|
||||
return EXPP_ReturnPyObjError( PyExc_MemoryError,
|
||||
"Material_getTextures: couldn't create PyTuple" );
|
||||
"couldn't create PyTuple" );
|
||||
|
||||
for( i = 0; i < MAX_MTEX; ++i ) {
|
||||
struct MTex *mtex = self->material->mtex[i];
|
||||
if( mtex ) {
|
||||
PyTuple_SET_ITEM( tuple, i, MTex_CreatePyObject( mtex, ID_MA ) );
|
||||
} else {
|
||||
Py_INCREF( Py_None );
|
||||
PyTuple_SET_ITEM( tuple, i, Py_None );
|
||||
}
|
||||
}
|
||||
|
||||
return tuple;
|
||||
}
|
||||
@ -2432,14 +2433,83 @@ static PyObject *Material_setTexture( BPy_Material * self, PyObject * args )
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static int Material_setTextures( BPy_Material * self, PyObject * value )
|
||||
{
|
||||
int i;
|
||||
|
||||
if( !PyList_Check( value ) && !PyTuple_Check( value ) )
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected tuple or list of integers" );
|
||||
|
||||
/* don't allow more than MAX_MTEX items */
|
||||
if( PySequence_Size(value) > MAX_MTEX )
|
||||
return EXPP_ReturnIntError( PyExc_AttributeError,
|
||||
"size of sequence greater than number of allowed textures" );
|
||||
|
||||
/* get a fast sequence; in Python 2.5, this just return the original
|
||||
* list or tuple and INCREFs it, so we must DECREF */
|
||||
value = PySequence_Fast( value, "" );
|
||||
|
||||
/* check the list for valid entries */
|
||||
for( i= 0; i < PySequence_Size(value) ; ++i ) {
|
||||
PyObject *item = PySequence_Fast_GET_ITEM( value, i );
|
||||
if( item != Py_None && !BPy_MTex_Check( item ) ) {
|
||||
Py_DECREF(value);
|
||||
return EXPP_ReturnIntError( PyExc_TypeError,
|
||||
"expected tuple or list containing MTex objects and NONE" );
|
||||
}
|
||||
}
|
||||
|
||||
/* for each MTex object, copy to this structure */
|
||||
for( i= 0; i < PySequence_Size(value) ; ++i ) {
|
||||
PyObject *item = PySequence_Fast_GET_ITEM( value, i );
|
||||
struct MTex *mtex = self->material->mtex[i];
|
||||
if( item != Py_None ) {
|
||||
BPy_MTex *obj = (BPy_MTex *)item;
|
||||
|
||||
/* if MTex is already at this location, just skip it */
|
||||
if( obj->mtex == mtex ) continue;
|
||||
|
||||
/* create a new entry if needed, otherwise update reference count
|
||||
* for texture that is being replaced */
|
||||
if( !mtex )
|
||||
mtex = self->material->mtex[i] = add_mtex( );
|
||||
else
|
||||
mtex->tex->id.us--;
|
||||
|
||||
/* copy the data */
|
||||
mtex->tex = obj->mtex->tex;
|
||||
id_us_plus( &mtex->tex->id );
|
||||
mtex->texco = obj->mtex->texco;
|
||||
mtex->mapto = obj->mtex->mapto;
|
||||
}
|
||||
}
|
||||
|
||||
/* now go back and free any entries now marked as None */
|
||||
for( i= 0; i < PySequence_Size(value) ; ++i ) {
|
||||
PyObject *item = PySequence_Fast_GET_ITEM( value, i );
|
||||
struct MTex *mtex = self->material->mtex[i];
|
||||
if( item == Py_None && mtex ) {
|
||||
mtex->tex->id.us--;
|
||||
MEM_freeN( mtex );
|
||||
self->material->mtex[i] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
Py_DECREF(value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static PyObject *Material_clearTexture( BPy_Material * self, PyObject * value )
|
||||
{
|
||||
int texnum = (int)PyInt_AsLong(value);
|
||||
struct MTex *mtex;
|
||||
/* non ints will be -1 */
|
||||
if( ( texnum < 0 ) || ( texnum >= MAX_MTEX ) )
|
||||
return EXPP_ReturnPyObjError( PyExc_TypeError,
|
||||
"expected int in [0,9]" );
|
||||
if( ( texnum < 0 ) || ( texnum >= MAX_MTEX ) ) {
|
||||
char errstr[64];
|
||||
sprintf( errstr, "expected int in [0,%d]", MAX_MTEX );
|
||||
return EXPP_ReturnPyObjError( PyExc_TypeError, errstr );
|
||||
}
|
||||
|
||||
mtex = self->material->mtex[texnum];
|
||||
if( mtex ) {
|
||||
|
||||
@ -108,7 +108,7 @@ struct PyMethodDef M_Mathutils_methods[] = {
|
||||
};
|
||||
/*----------------------------MODULE INIT-------------------------*/
|
||||
/* from can be Blender.Mathutils or GameLogic.Mathutils for the BGE */
|
||||
PyObject *Mathutils_Init(char *from)
|
||||
PyObject *Mathutils_Init(const char *from)
|
||||
{
|
||||
PyObject *submodule;
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
#include "euler.h"
|
||||
#include "point.h"
|
||||
|
||||
PyObject *Mathutils_Init( char * from );
|
||||
PyObject *Mathutils_Init( const char * from );
|
||||
PyObject *row_vector_multiplication(VectorObject* vec, MatrixObject * mat);
|
||||
PyObject *column_vector_multiplication(MatrixObject * mat, VectorObject* vec);
|
||||
PyObject *row_point_multiplication(PointObject* pt, MatrixObject * mat);
|
||||
|
||||
@ -4163,6 +4163,7 @@ static int MFace_setMode( BPy_MFace *self, PyObject *value )
|
||||
{
|
||||
int param;
|
||||
static short bitmask = TF_DYNAMIC
|
||||
| TF_ALPHASORT
|
||||
| TF_TEX
|
||||
| TF_SHAREDVERT
|
||||
| TF_LIGHT
|
||||
@ -8696,11 +8697,11 @@ static PyObject *M_Mesh_FaceModesDict( void )
|
||||
if( FM ) {
|
||||
BPy_constant *d = ( BPy_constant * ) FM;
|
||||
|
||||
PyConstant_Insert( d, "BILLBOARD",
|
||||
PyInt_FromLong( TF_BILLBOARD2 ) );
|
||||
PyConstant_Insert( d, "BILLBOARD", PyInt_FromLong( TF_BILLBOARD2 ) );
|
||||
PyConstant_Insert( d, "ALL", PyInt_FromLong( 0xffff ) );
|
||||
PyConstant_Insert( d, "HALO", PyInt_FromLong( TF_BILLBOARD ) );
|
||||
PyConstant_Insert( d, "DYNAMIC", PyInt_FromLong( TF_DYNAMIC ) );
|
||||
PyConstant_Insert( d, "ALPHASORT", PyInt_FromLong( TF_ALPHASORT ) );
|
||||
PyConstant_Insert( d, "INVISIBLE", PyInt_FromLong( TF_INVISIBLE ) );
|
||||
PyConstant_Insert( d, "LIGHT", PyInt_FromLong( TF_LIGHT ) );
|
||||
PyConstant_Insert( d, "OBCOL", PyInt_FromLong( TF_OBCOL ) );
|
||||
|
||||
@ -526,15 +526,18 @@ throws NameError if name not found
|
||||
|
||||
PyObject *M_ParticleSys_Get( PyObject * self, PyObject * args )
|
||||
{
|
||||
#if 1
|
||||
return EXPP_ReturnPyObjError( PyExc_NotImplementedError,
|
||||
"Particle.Get() not implemented" );
|
||||
#else
|
||||
ParticleSettings *psys_iter;
|
||||
char *name = NULL;
|
||||
#if 0
|
||||
|
||||
ParticleSystem *blparticlesys = 0;
|
||||
Object *ob;
|
||||
|
||||
PyObject *partsyslist,*current;
|
||||
#endif
|
||||
|
||||
if( !PyArg_ParseTuple( args, "|s", &name ) )
|
||||
return EXPP_ReturnPyObjError( PyExc_TypeError,
|
||||
"expected string argument" );
|
||||
@ -577,7 +580,6 @@ PyObject *M_ParticleSys_Get( PyObject * self, PyObject * args )
|
||||
}
|
||||
|
||||
while( psys_iter ){
|
||||
#if 0
|
||||
pyobj = ParticleSystem_CreatePyObject( psys_iter);
|
||||
if( !pyobj){
|
||||
Py_DECREF( pylist );
|
||||
@ -586,7 +588,6 @@ PyObject *M_ParticleSys_Get( PyObject * self, PyObject * args )
|
||||
"could not create ParticleSystem PyObject");
|
||||
}
|
||||
PyList_SET_ITEM( pylist, index, pyobj);
|
||||
#endif
|
||||
printf("name is %s\n", psys_iter->id.name+2);
|
||||
psys_iter = psys_iter->id.next;
|
||||
index++;
|
||||
@ -596,10 +597,6 @@ PyObject *M_ParticleSys_Get( PyObject * self, PyObject * args )
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
#if 0
|
||||
|
||||
for( ob = G.main->particlesystem.first; ob; ob = ob->id.next )
|
||||
if( !strcmp( name, ob->id.name + 2 ) )
|
||||
break;
|
||||
@ -626,7 +623,6 @@ PyObject *M_ParticleSys_Get( PyObject * self, PyObject * args )
|
||||
}
|
||||
|
||||
return partsyslist;
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@ -1195,6 +1195,7 @@ static PyObject *M_Texture_ExtendModesDict( void )
|
||||
PyConstant_Insert(d, "CLIP", PyInt_FromLong(TEX_CLIP));
|
||||
PyConstant_Insert(d, "CLIPCUBE", PyInt_FromLong(TEX_CLIPCUBE));
|
||||
PyConstant_Insert(d, "REPEAT", PyInt_FromLong(TEX_REPEAT));
|
||||
PyConstant_Insert(d, "CHECKER", PyInt_FromLong(TEX_CHECKER));
|
||||
}
|
||||
return ExtendModes;
|
||||
}
|
||||
|
||||
@ -52,6 +52,7 @@
|
||||
#include "BIF_space.h"
|
||||
#include "mydevice.h"
|
||||
#include "Ipo.h"
|
||||
#include "MTex.h"
|
||||
#include "gen_utils.h"
|
||||
#include "gen_library.h"
|
||||
|
||||
@ -99,6 +100,7 @@ static PyObject *World_getScriptLinks( BPy_World * self, PyObject * value );
|
||||
static PyObject *World_addScriptLink( BPy_World * self, PyObject * args );
|
||||
static PyObject *World_clearScriptLinks( BPy_World * self, PyObject * args );
|
||||
static PyObject *World_setCurrent( BPy_World * self );
|
||||
static PyObject *World_getTextures( BPy_World * self );
|
||||
static PyObject *World_copy( BPy_World * self );
|
||||
|
||||
|
||||
@ -250,6 +252,9 @@ static PyGetSetDef BPy_World_getseters[] = {
|
||||
"world mist settings", NULL},
|
||||
{"ipo", (getter)World_getIpo, (setter)World_setIpo,
|
||||
"world ipo", NULL},
|
||||
{"textures", (getter)World_getTextures, (setter)NULL,
|
||||
"The World's texture list as a tuple",
|
||||
NULL},
|
||||
{NULL,NULL,NULL,NULL,NULL} /* Sentinel */
|
||||
};
|
||||
|
||||
@ -1029,3 +1034,27 @@ static PyObject *World_insertIpoKey( BPy_World * self, PyObject * args )
|
||||
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static PyObject *World_getTextures( BPy_World * self )
|
||||
{
|
||||
int i;
|
||||
PyObject *tuple;
|
||||
|
||||
/* build a texture list */
|
||||
tuple = PyTuple_New( MAX_MTEX );
|
||||
if( !tuple )
|
||||
return EXPP_ReturnPyObjError( PyExc_MemoryError,
|
||||
"couldn't create PyTuple" );
|
||||
|
||||
for( i = 0; i < MAX_MTEX; ++i ) {
|
||||
struct MTex *mtex = self->world->mtex[i];
|
||||
if( mtex ) {
|
||||
PyTuple_SET_ITEM( tuple, i, MTex_CreatePyObject( mtex, ID_WO ) );
|
||||
} else {
|
||||
Py_INCREF( Py_None );
|
||||
PyTuple_SET_ITEM( tuple, i, Py_None );
|
||||
}
|
||||
}
|
||||
|
||||
return tuple;
|
||||
}
|
||||
|
||||
@ -161,6 +161,8 @@ class Lamp:
|
||||
@type type: int
|
||||
@ivar falloffType: Lamp falloff type. See L{Falloffs} for values.
|
||||
@type falloffType: int
|
||||
@type textures: a tuple of Blender MTex objects.
|
||||
@ivar textures: The Lamp's texture list. Empty texture channels contains None.
|
||||
|
||||
@warning: Most member variables assume values in some [Min, Max] interval.
|
||||
When trying to set them, the given parameter will be clamped to lie in
|
||||
|
||||
@ -338,7 +338,9 @@ class Material:
|
||||
ch.append(4)
|
||||
mat.enabledTextures = ch
|
||||
print mat.enabledTextures # will print: [0, 4, 6]
|
||||
|
||||
|
||||
@type textures: a tuple of Blender MTex objects.
|
||||
@ivar textures: the Material's Texture list. Empty texture channels contains None.
|
||||
@ivar enableSSS: If True, subsurface scattering will be rendered on this material.
|
||||
@type enableSSS: bool
|
||||
@ivar sssScale: If True, subsurface scattering will be rendered on this material.
|
||||
|
||||
@ -69,6 +69,7 @@ done once.
|
||||
- BILLBOARD - always orient after camera.
|
||||
- HALO - halo face, always point to camera.
|
||||
- DYNAMIC - respond to collisions.
|
||||
- ALPHASORT - game engine sorts these faces only.
|
||||
- INVISIBLE - invisible face.
|
||||
- LIGHT - dynamic lighting.
|
||||
- OBCOL - use object color instead of vertex colors.
|
||||
|
||||
@ -500,48 +500,84 @@ class MTex:
|
||||
This object links a material to a texture. It allows the same texture to be
|
||||
used in several different ways.
|
||||
|
||||
@ivar tex: The Texture this is linked to.
|
||||
@type tex: Blender Texture
|
||||
@ivar texco: Texture coordinates ("Map input"). See L{TexCo}
|
||||
@ivar mapto: "Map to" field of texture. OR'd values of L{MapTo}
|
||||
@ivar object: Object whose space to use when texco is Object
|
||||
@type object: Blender Object
|
||||
@ivar col: Color that the texture blends with
|
||||
@ivar dvar: Value that the texture blends with when not blending colors
|
||||
@ivar blendmode: Texture blending mode. L{BlendModes}
|
||||
@ivar colfac: Factor by which texture affects color
|
||||
@ivar norfac: Factor by which texture affects normal
|
||||
@ivar varfac: Factor by which texture affects most variables
|
||||
@ivar dispfac: Factor by which texture affects displacement
|
||||
@ivar warpfac: Factor by which texture affects warp
|
||||
@ivar ofs: Offset to adjust texture space
|
||||
@ivar size: Size to scale texture space
|
||||
@ivar mapping: Mapping of texture coordinates (flat, cube, etc.). L{Mappings}
|
||||
@ivar stencil: Stencil mode
|
||||
@ivar neg: Negate texture values mode
|
||||
@ivar noRGB: Convert texture RGB values to intensity values
|
||||
@ivar correctNor: Correct normal mapping for Texture space and Object space
|
||||
@ivar fromDupli: Dupli's instanced from verts, faces or particles, inherit texture coordinate from their parent
|
||||
@ivar fromOrig: Dupli's derive their object coordinates from the original objects transformation
|
||||
@ivar xproj: Projection of X axis to Texture space. L{Proj}
|
||||
@ivar yproj: Projection of Y axis to Texture space. L{Proj}
|
||||
@ivar zproj: Projection of Z axis to Texture space. L{Proj}
|
||||
@ivar mtCol: How texture maps to color
|
||||
@ivar mtNor: How texture maps to normals
|
||||
@ivar mtCsp: How texture maps to specularity color
|
||||
@ivar mtCmir: How texture maps to mirror color
|
||||
@ivar mtRef: How texture maps to reflectivity
|
||||
@ivar mtSpec: How texture maps to specularity
|
||||
@ivar mtEmit: How texture maps to emit value
|
||||
@ivar mtAlpha: How texture maps to alpha value
|
||||
@ivar mtHard: How texture maps to hardness
|
||||
@ivar mtRayMir: How texture maps to RayMir value
|
||||
@ivar mtTranslu: How texture maps to translucency
|
||||
@ivar mtAmb: How texture maps to ambient value
|
||||
@ivar mtDisp: How texture maps to displacement
|
||||
@ivar mtWarp: How texture maps to warp
|
||||
@ivar uvlayer: The name of the UV Layer this texture is mapped to (when left blank uses render layer)
|
||||
@type uvlayer: string
|
||||
@type blendmode: int
|
||||
@ivar blendmode: Texture blending mode. See L{BlendModes}
|
||||
@type col: tuple
|
||||
@ivar col: Color that the texture blends with. Range of.
|
||||
@type colfac: float
|
||||
@ivar colfac: Factor by which texture affects color.
|
||||
@ivar correctNor: Correct normal mapping for Texture space and Object space.
|
||||
@type correctNor: boolean
|
||||
@type dispfac: float
|
||||
@ivar dispfac: Factor by which texture affects displacement.
|
||||
@type dvar: float
|
||||
@ivar dvar: Value that the texture blends with when not blending colors.
|
||||
@type fromDupli: boolean
|
||||
@ivar fromDupli: Duplis instanced from verts, faces or particles, inherit texture coordinate from their parent.
|
||||
@type fromOrig: boolean
|
||||
@ivar fromOrig: Duplis derive their object coordinates from the original objects transformation.
|
||||
@type mapping: int
|
||||
@ivar mapping: Mapping of texture coordinates (flat, cube, etc.). See L{Mappings}.
|
||||
@type mapto: int
|
||||
@ivar mapto: "Map to" field of texture. OR'd values of L{MapTo}.
|
||||
@ivar mtAlpha: How texture maps to alpha value.
|
||||
@type mtAlpha: int
|
||||
@ivar mtAmb: How texture maps to ambient value.
|
||||
@type mtAmb: int
|
||||
@ivar mtCmir: How texture maps to mirror color.
|
||||
@type mtCmir: int
|
||||
@ivar mtCol: How texture maps to color.
|
||||
@type mtCol: int
|
||||
@ivar mtCsp: How texture maps to specularity color
|
||||
@type mtCsp: int
|
||||
@ivar mtDisp: How texture maps to displacement
|
||||
@type mtDisp: int
|
||||
@ivar mtEmit: How texture maps to emit value
|
||||
@type mtEmit: int
|
||||
@ivar mtHard: How texture maps to hardness
|
||||
@type mtHard: int
|
||||
@ivar mtNor: How texture maps to normals
|
||||
@type mtNor: int
|
||||
@ivar mtRayMir: How texture maps to RayMir value
|
||||
@type mtRayMir: int
|
||||
@ivar mtRef: How texture maps to reflectivity
|
||||
@type mtRef: int
|
||||
@ivar mtSpec: How texture maps to specularity
|
||||
@type mtSpec: int
|
||||
@ivar mtTranslu: How texture maps to translucency
|
||||
@type mtTranslu: int
|
||||
@ivar mtWarp: How texture maps to warp
|
||||
@type mtWarp: int
|
||||
@ivar neg: Negate texture values mode
|
||||
@type neg: boolean
|
||||
@ivar norfac: Factor by which texture affects normal
|
||||
@type norfac: float
|
||||
@ivar noRGB: Convert texture RGB values to intensity values
|
||||
@type noRGB: boolean
|
||||
@ivar object: Object whose space to use when texco is Object
|
||||
@type object: Blender Object or None
|
||||
@type ofs: tuple
|
||||
@ivar ofs: Offset to adjust texture space
|
||||
@type size: tuple
|
||||
@ivar size: Size to scale texture space
|
||||
@ivar stencil: Stencil mode
|
||||
@type stencil: boolean
|
||||
@ivar tex: The Texture this is linked to.
|
||||
@type tex: Blender Texture
|
||||
@ivar texco: Texture coordinates ("Map input"). See L{TexCo}
|
||||
@type texco: int
|
||||
@ivar uvlayer: The name of the UV Layer this texture is mapped to (when left blank uses render layer)
|
||||
@type uvlayer: string
|
||||
@type varfac: float
|
||||
@ivar varfac: Factor by which texture affects most variables
|
||||
@type warpfac: float
|
||||
@ivar warpfac: Factor by which texture affects warp
|
||||
@type xproj: int
|
||||
@ivar xproj: Projection of X axis to Texture space. See L{Proj}
|
||||
@type yproj: int
|
||||
@ivar yproj: Projection of Y axis to Texture space. See L{Proj}
|
||||
@type zproj: int
|
||||
@ivar zproj: Projection of Z axis to Texture space. See L{Proj}
|
||||
"""
|
||||
|
||||
def getIpo():
|
||||
|
||||
@ -82,6 +82,8 @@ class World:
|
||||
@ivar mist: the mist parameters of a world object. See getMist for the semantics of these parameters.
|
||||
@type ipo: Blender Ipo
|
||||
@ivar ipo: The world type ipo linked to this world object.
|
||||
@type textures: a tuple of Blender MTex objects.
|
||||
@ivar textures: The World's texture list. Empty texture channels contains None.
|
||||
"""
|
||||
|
||||
def getRange():
|
||||
|
||||
@ -45,6 +45,7 @@
|
||||
Py_RETURN_NONE
|
||||
Python 2.4 macro.
|
||||
defined here until we switch to 2.4
|
||||
also in PyObjectPlus.h for gameengine
|
||||
*/
|
||||
#ifndef Py_RETURN_NONE
|
||||
#define Py_RETURN_NONE return Py_BuildValue("O", Py_None)
|
||||
|
||||
@ -33,12 +33,14 @@
|
||||
#include "DNA_scene_types.h" /* for Base */
|
||||
|
||||
#include "BKE_mesh.h"
|
||||
#include "BKE_image.h" // RFS: openanim
|
||||
#include "BKE_library.h"
|
||||
#include "BKE_global.h"
|
||||
#include "BKE_main.h"
|
||||
#include "BKE_scene.h"
|
||||
|
||||
#include "BIF_editseq.h" /* get_last_seq */
|
||||
#include "BIF_editsound.h" // RFS: sound_open_hdaudio
|
||||
#include "BLI_blenlib.h"
|
||||
#include "BSE_sequence.h"
|
||||
#include "Ipo.h"
|
||||
@ -48,6 +50,9 @@
|
||||
#include "Sound.h"
|
||||
#include "gen_utils.h"
|
||||
|
||||
#include "IMB_imbuf_types.h" // RFS: IB_rect
|
||||
#include "IMB_imbuf.h" // RFS: IMB_anim_get_duration
|
||||
|
||||
enum seq_consts {
|
||||
EXPP_SEQ_ATTR_TYPE = 0,
|
||||
EXPP_SEQ_ATTR_CHAN,
|
||||
@ -145,7 +150,6 @@ static PyObject *NewSeq_internal(ListBase *seqbase, PyObject * args, Scene *sce)
|
||||
|
||||
seq->len = PyList_Size( list );
|
||||
|
||||
|
||||
/* strip and stripdata */
|
||||
seq->strip= strip= MEM_callocN(sizeof(Strip), "strip");
|
||||
strip->len= seq->len;
|
||||
@ -185,12 +189,103 @@ static PyObject *NewSeq_internal(ListBase *seqbase, PyObject * args, Scene *sce)
|
||||
strip->us= 1;
|
||||
strip->stripdata= se= MEM_callocN(seq->len*sizeof(StripElem), "stripelem");
|
||||
|
||||
} else if (PyTuple_Check(py_data) && PyTuple_GET_SIZE(py_data) == 4) {
|
||||
// MOVIE or AUDIO_HD
|
||||
char *filename;
|
||||
char *dir;
|
||||
char *fullpath;
|
||||
char *type;
|
||||
int totframe;
|
||||
|
||||
if (!PyArg_ParseTuple( py_data, "ssss", &filename, &dir, &fullpath, &type )) {
|
||||
BLI_remlink(seqbase, seq);
|
||||
MEM_freeN(seq);
|
||||
|
||||
return EXPP_ReturnPyObjError( PyExc_ValueError,
|
||||
"movie/audio hd data needs to be a tuple of a string and a list of images - (filename, dir, fullpath, type)" );
|
||||
}
|
||||
|
||||
// RFS - Attempting to support Movie and Audio (HD) strips
|
||||
#define RFS
|
||||
#ifdef RFS
|
||||
// Movie strips
|
||||
if( strcmp( type, "movie" ) == 0 )
|
||||
{
|
||||
/* open it as an animation */
|
||||
struct anim * an = openanim(fullpath, IB_rect);
|
||||
if(an==0) {
|
||||
BLI_remlink(seqbase, seq);
|
||||
MEM_freeN(seq);
|
||||
|
||||
return EXPP_ReturnPyObjError( PyExc_ValueError,
|
||||
"invalid movie strip" );
|
||||
}
|
||||
|
||||
/* get the length in frames */
|
||||
totframe = IMB_anim_get_duration( an );
|
||||
|
||||
/* set up sequence */
|
||||
seq->type= SEQ_MOVIE;
|
||||
seq->len= totframe;
|
||||
seq->anim= an;
|
||||
seq->anim_preseek = IMB_anim_get_preseek(an);
|
||||
|
||||
calc_sequence(seq);
|
||||
|
||||
/* strip and stripdata */
|
||||
seq->strip= strip= MEM_callocN(sizeof(Strip), "strip");
|
||||
strip->len= totframe;
|
||||
strip->us= 1;
|
||||
strncpy(strip->dir, dir, FILE_MAXDIR-1); // ????
|
||||
strip->stripdata= se= MEM_callocN(sizeof(StripElem), "stripelem");
|
||||
|
||||
/* name movie in first strip */
|
||||
strncpy(se->name, filename, FILE_MAXFILE-1); // ????
|
||||
}
|
||||
|
||||
// Audio (HD) strips
|
||||
if( strcmp( type, "audio_hd" ) == 0 )
|
||||
{
|
||||
struct hdaudio *hdaudio;
|
||||
|
||||
totframe= 0;
|
||||
|
||||
/* is it a sound file? */
|
||||
hdaudio = sound_open_hdaudio( fullpath );
|
||||
if(hdaudio==0) {
|
||||
BLI_remlink(seqbase, seq);
|
||||
MEM_freeN(seq);
|
||||
|
||||
return EXPP_ReturnPyObjError( PyExc_ValueError,
|
||||
fullpath );
|
||||
}
|
||||
|
||||
totframe= sound_hdaudio_get_duration(hdaudio, FPS);
|
||||
|
||||
/* set up sequence */
|
||||
seq->type= SEQ_HD_SOUND;
|
||||
seq->len= totframe;
|
||||
seq->hdaudio= hdaudio;
|
||||
|
||||
calc_sequence(seq);
|
||||
|
||||
/* strip and stripdata - same as for MOVIE */
|
||||
seq->strip= strip= MEM_callocN(sizeof(Strip), "strip");
|
||||
strip->len= totframe;
|
||||
strip->us= 1;
|
||||
strncpy(strip->dir, dir, FILE_MAXDIR-1); // ????
|
||||
strip->stripdata= se= MEM_callocN(sizeof(StripElem), "stripelem");
|
||||
|
||||
/* name movie in first strip */
|
||||
strncpy(se->name, filename, FILE_MAXFILE-1); // ????
|
||||
}
|
||||
#endif
|
||||
|
||||
} else if (BPy_Sound_Check(py_data)) {
|
||||
/* sound */
|
||||
/* RAM sound */
|
||||
int totframe;
|
||||
bSound *sound = (( BPy_Sound * )py_data)->sound;
|
||||
|
||||
|
||||
seq->type= SEQ_RAM_SOUND;
|
||||
seq->sound = sound;
|
||||
|
||||
@ -198,7 +293,6 @@ static PyObject *NewSeq_internal(ListBase *seqbase, PyObject * args, Scene *sce)
|
||||
|
||||
sound->flags |= SOUND_FLAGS_SEQUENCE;
|
||||
|
||||
|
||||
/* strip and stripdata */
|
||||
seq->strip= strip= MEM_callocN(sizeof(Strip), "strip");
|
||||
strip->len= totframe;
|
||||
@ -225,18 +319,7 @@ static PyObject *NewSeq_internal(ListBase *seqbase, PyObject * args, Scene *sce)
|
||||
strip->len= seq->len;
|
||||
strip->us= 1;
|
||||
} else {
|
||||
/* movie, pydata is a path to a movie file */
|
||||
char *name = PyString_AsString ( py_data );
|
||||
if (!name) {
|
||||
/* only free these 2 because other stuff isnt set */
|
||||
BLI_remlink(seqbase, seq);
|
||||
MEM_freeN(seq);
|
||||
|
||||
return EXPP_ReturnPyObjError( PyExc_TypeError,
|
||||
"expects a string for chan/bone name and an int for the frame where to put the new key" );
|
||||
}
|
||||
|
||||
seq->type= SEQ_MOVIE;
|
||||
// RFS: REMOVED MOVIE FROM HERE
|
||||
}
|
||||
strncpy(seq->name+2, "Untitled", 21);
|
||||
intern_pos_update(seq);
|
||||
|
||||
@ -1678,7 +1678,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
|
||||
psys->lattice=psys_get_lattice(ob,psys);
|
||||
|
||||
/* 3. start creating renderable things */
|
||||
for(a=0,pa=pars; a<totpart+totchild; a++, pa++) {
|
||||
for(a=0,pa=pars; a<totpart+totchild; a++, pa++, seed++) {
|
||||
random = rng_getFloat(rng);
|
||||
|
||||
if(a<totpart){
|
||||
@ -4468,17 +4468,19 @@ static int allow_render_object(Object *ob, int nolamps, int onlyselected, Object
|
||||
static int allow_render_dupli_instance(Render *re, DupliObject *dob, Object *obd)
|
||||
{
|
||||
ParticleSystem *psys;
|
||||
Material ***material;
|
||||
Material *ma;
|
||||
short a, *totmaterial;
|
||||
|
||||
/* don't allow objects with halos */
|
||||
/* don't allow objects with halos. we need to have
|
||||
* all halo's to sort them globally in advance */
|
||||
totmaterial= give_totcolp(obd);
|
||||
material= give_matarar(obd);
|
||||
|
||||
if(totmaterial && material) {
|
||||
for(a= 0; a<*totmaterial; a++)
|
||||
if((*material)[a] && (*material)[a]->mode & MA_HALO)
|
||||
if(totmaterial) {
|
||||
for(a= 0; a<*totmaterial; a++) {
|
||||
ma= give_current_material(obd, a);
|
||||
if(ma && (ma->mode & MA_HALO))
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
for(psys=obd->particlesystem.first; psys; psys=psys->next)
|
||||
|
||||
@ -2346,6 +2346,12 @@ static int is_rendering_allowed(Render *re)
|
||||
if(re->osa==0)
|
||||
re->r.scemode &= ~R_FULL_SAMPLE;
|
||||
|
||||
/* no fullsample and edge */
|
||||
if((re->r.scemode & R_FULL_SAMPLE) && (re->r.mode & R_EDGE)) {
|
||||
re->error("Full Sample doesn't support Edge Enhance");
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
re->r.scemode &= ~R_FULL_SAMPLE; /* clear to be sure */
|
||||
|
||||
@ -158,7 +158,7 @@ static int calchalo_z(HaloRen *har, int zz)
|
||||
{
|
||||
|
||||
if(har->type & HA_ONLYSKY) {
|
||||
if(zz!=0x7FFFFFFF) zz= - 0x7FFFFF;
|
||||
if(zz < 0x7FFFFFF0) zz= - 0x7FFFFF; /* edge render messes zvalues */
|
||||
}
|
||||
else {
|
||||
zz= (zz>>8);
|
||||
@ -931,17 +931,23 @@ static void edge_enhance_add(RenderPart *pa, float *rectf, float *arect)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void convert_to_key_alpha(RenderPart *pa, float *rectf)
|
||||
static void convert_to_key_alpha(RenderPart *pa, RenderLayer *rl)
|
||||
{
|
||||
int y;
|
||||
RenderLayer *rlpp[RE_MAX_OSA];
|
||||
int y, sample, totsample;
|
||||
|
||||
for(y= pa->rectx*pa->recty; y>0; y--, rectf+=4) {
|
||||
if(rectf[3] >= 1.0f);
|
||||
else if(rectf[3] > 0.0f) {
|
||||
rectf[0] /= rectf[3];
|
||||
rectf[1] /= rectf[3];
|
||||
rectf[2] /= rectf[3];
|
||||
totsample= get_sample_layers(pa, rl, rlpp);
|
||||
|
||||
for(sample= 0; sample<totsample; sample++) {
|
||||
float *rectf= rlpp[sample]->rectf;
|
||||
|
||||
for(y= pa->rectx*pa->recty; y>0; y--, rectf+=4) {
|
||||
if(rectf[3] >= 1.0f);
|
||||
else if(rectf[3] > 0.0f) {
|
||||
rectf[0] /= rectf[3];
|
||||
rectf[1] /= rectf[3];
|
||||
rectf[2] /= rectf[3];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1229,7 +1235,7 @@ void zbufshadeDA_tile(RenderPart *pa)
|
||||
|
||||
/* de-premul alpha */
|
||||
if(R.r.alphamode & R_ALPHAKEY)
|
||||
convert_to_key_alpha(pa, rl->rectf);
|
||||
convert_to_key_alpha(pa, rl);
|
||||
|
||||
/* free stuff within loop! */
|
||||
MEM_freeN(pa->rectdaps); pa->rectdaps= NULL;
|
||||
@ -1393,7 +1399,7 @@ void zbufshade_tile(RenderPart *pa)
|
||||
|
||||
/* de-premul alpha */
|
||||
if(R.r.alphamode & R_ALPHAKEY)
|
||||
convert_to_key_alpha(pa, rl->rectf);
|
||||
convert_to_key_alpha(pa, rl);
|
||||
|
||||
if(edgerect) MEM_freeN(edgerect);
|
||||
edgerect= NULL;
|
||||
|
||||
@ -483,16 +483,16 @@ void RE_set_customdata_names(ObjectRen *obr, CustomData *data)
|
||||
DerivedMesh which stores the layers is freed */
|
||||
|
||||
CustomDataLayer *layer;
|
||||
int numlayers, i, mtfn, mcn;
|
||||
int numtf = 0, numcol = 0, i, mtfn, mcn;
|
||||
|
||||
if (CustomData_has_layer(data, CD_MTFACE)) {
|
||||
numlayers= CustomData_number_of_layers(data, CD_MTFACE);
|
||||
obr->mtface= MEM_callocN(sizeof(*obr->mtface)*numlayers, "mtfacenames");
|
||||
numtf= CustomData_number_of_layers(data, CD_MTFACE);
|
||||
obr->mtface= MEM_callocN(sizeof(*obr->mtface)*numtf, "mtfacenames");
|
||||
}
|
||||
|
||||
if (CustomData_has_layer(data, CD_MCOL)) {
|
||||
numlayers= CustomData_number_of_layers(data, CD_MCOL);
|
||||
obr->mcol= MEM_callocN(sizeof(*obr->mcol)*numlayers, "mcolnames");
|
||||
numcol= CustomData_number_of_layers(data, CD_MCOL);
|
||||
obr->mcol= MEM_callocN(sizeof(*obr->mcol)*numcol, "mcolnames");
|
||||
}
|
||||
|
||||
for (i=0, mtfn=0, mcn=0; i < data->totlayer; i++) {
|
||||
@ -500,12 +500,12 @@ void RE_set_customdata_names(ObjectRen *obr, CustomData *data)
|
||||
|
||||
if (layer->type == CD_MTFACE) {
|
||||
strcpy(obr->mtface[mtfn++], layer->name);
|
||||
obr->actmtface= layer->active_rnd;
|
||||
obr->actmtface= CLAMPIS(layer->active_rnd, 0, numtf);
|
||||
obr->bakemtface= layer->active;
|
||||
}
|
||||
else if (layer->type == CD_MCOL) {
|
||||
strcpy(obr->mcol[mcn++], layer->name);
|
||||
obr->actmcol= layer->active_rnd;
|
||||
obr->actmcol= CLAMPIS(layer->active_rnd, 0, numcol);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2981,10 +2981,11 @@ void RE_zbuf_accumulate_vecblur(NodeBlurData *nbd, int xsize, int ysize, float *
|
||||
{
|
||||
ZSpan zspan;
|
||||
DrawBufPixel *rectdraw, *dr;
|
||||
static float jit[16][2];
|
||||
static float jit[256][2];
|
||||
float v1[3], v2[3], v3[3], v4[3], fx, fy;
|
||||
float *rectvz, *dvz, *dimg, *dvec1, *dvec2, *dz, *dz1, *dz2, *rectz, *minvecbufrect= NULL;
|
||||
float maxspeedsq= (float)nbd->maxspeed*nbd->maxspeed;
|
||||
float *rectvz, *dvz, *dimg, *dvec1, *dvec2, *dz, *dz1, *dz2, *rectz;
|
||||
float *minvecbufrect= NULL, *rectweight, *rw, *rectmax, *rm, *ro;
|
||||
float maxspeedsq= (float)nbd->maxspeed*nbd->maxspeed, totfac;
|
||||
int y, x, step, maxspeed=nbd->maxspeed, samples= nbd->samples;
|
||||
int tsktsk= 0;
|
||||
static int firsttime= 1;
|
||||
@ -3003,6 +3004,9 @@ void RE_zbuf_accumulate_vecblur(NodeBlurData *nbd, int xsize, int ysize, float *
|
||||
rectmove= MEM_mapallocN(xsize*ysize, "rectmove");
|
||||
rectdraw= MEM_mapallocN(sizeof(DrawBufPixel)*xsize*ysize, "rect draw");
|
||||
zspan.rectp= (int *)rectdraw;
|
||||
|
||||
rectweight= MEM_mapallocN(sizeof(float)*xsize*ysize, "rect weight");
|
||||
rectmax= MEM_mapallocN(sizeof(float)*xsize*ysize, "rect max");
|
||||
|
||||
/* debug... check if PASS_VECTOR_MAX still is in buffers */
|
||||
dvec1= vecbufrect;
|
||||
@ -3142,7 +3146,7 @@ void RE_zbuf_accumulate_vecblur(NodeBlurData *nbd, int xsize, int ysize, float *
|
||||
dm= rectmove;
|
||||
dvec1= vecbufrect;
|
||||
for(x=xsize*ysize; x>0; x--, dm++, dvec1+=4) {
|
||||
if(dvec1[0]!=0.0f || dvec1[1]!=0.0f || dvec1[2]!=0.0f || dvec1[3]!=0.0f)
|
||||
if((dvec1[0]!=0.0f || dvec1[1]!=0.0f || dvec1[2]!=0.0f || dvec1[3]!=0.0f))
|
||||
*dm= 255;
|
||||
}
|
||||
|
||||
@ -3151,9 +3155,12 @@ void RE_zbuf_accumulate_vecblur(NodeBlurData *nbd, int xsize, int ysize, float *
|
||||
/* has to become static, the init-jit calls a random-seed, screwing up texture noise node */
|
||||
if(firsttime) {
|
||||
firsttime= 0;
|
||||
BLI_initjit(jit[0], 16);
|
||||
BLI_initjit(jit[0], 256);
|
||||
}
|
||||
|
||||
memset(newrect, 0, sizeof(float)*xsize*ysize*4);
|
||||
totfac= 0.0f;
|
||||
|
||||
/* accumulate */
|
||||
samples/= 2;
|
||||
for(step= 1; step<=samples; step++) {
|
||||
@ -3161,7 +3168,7 @@ void RE_zbuf_accumulate_vecblur(NodeBlurData *nbd, int xsize, int ysize, float *
|
||||
int side;
|
||||
|
||||
for(side=0; side<2; side++) {
|
||||
float blendfac= 1.0f/((ABS(step)*2+side)+1), ipodata[4];
|
||||
float blendfac, ipodata[4];
|
||||
|
||||
/* clear zbuf, if we draw future we fill in not moving pixels */
|
||||
if(0)
|
||||
@ -3193,30 +3200,32 @@ void RE_zbuf_accumulate_vecblur(NodeBlurData *nbd, int xsize, int ysize, float *
|
||||
|
||||
set_quad_bezier_ipo(0.5f + 0.5f*speedfac, ipodata);
|
||||
|
||||
for(fy= -0.5f+jit[step & 15][0], y=0; y<ysize; y++, fy+=1.0f) {
|
||||
for(fx= -0.5f+jit[step & 15][1], x=0; x<xsize; x++, fx+=1.0f, dimg+=4, dz1+=4, dz2+=4, dm++, dz++) {
|
||||
for(fy= -0.5f+jit[step & 255][0], y=0; y<ysize; y++, fy+=1.0f) {
|
||||
for(fx= -0.5f+jit[step & 255][1], x=0; x<xsize; x++, fx+=1.0f, dimg+=4, dz1+=4, dz2+=4, dm++, dz++) {
|
||||
if(*dm>1) {
|
||||
float jfx = fx + 0.5f;
|
||||
float jfy = fy + 0.5f;
|
||||
DrawBufPixel col;
|
||||
|
||||
/* make vertices */
|
||||
if(nbd->curved) { /* curved */
|
||||
quad_bezier_2d(v1, dz1, dz1+2, ipodata);
|
||||
v1[0]+= fx; v1[1]+= fy; v1[2]= *dz;
|
||||
v1[0]+= jfx; v1[1]+= jfy; v1[2]= *dz;
|
||||
|
||||
quad_bezier_2d(v2, dz1+4, dz1+4+2, ipodata);
|
||||
v2[0]+= fx+1.0f; v2[1]+= fy; v2[2]= *dz;
|
||||
v2[0]+= jfx+1.0f; v2[1]+= jfy; v2[2]= *dz;
|
||||
|
||||
quad_bezier_2d(v3, dz2+4, dz2+4+2, ipodata);
|
||||
v3[0]+= fx+1.0f; v3[1]+= fy+1.0f; v3[2]= *dz;
|
||||
v3[0]+= jfx+1.0f; v3[1]+= jfy+1.0f; v3[2]= *dz;
|
||||
|
||||
quad_bezier_2d(v4, dz2, dz2+2, ipodata);
|
||||
v4[0]+= fx; v4[1]+= fy+1.0f; v4[2]= *dz;
|
||||
v4[0]+= jfx; v4[1]+= jfy+1.0f; v4[2]= *dz;
|
||||
}
|
||||
else {
|
||||
v1[0]= speedfac*dz1[0]+fx; v1[1]= speedfac*dz1[1]+fy; v1[2]= *dz;
|
||||
v2[0]= speedfac*dz1[4]+fx+1.0f; v2[1]= speedfac*dz1[5]+fy; v2[2]= *dz;
|
||||
v3[0]= speedfac*dz2[4]+fx+1.0f; v3[1]= speedfac*dz2[5]+fy+1.0f; v3[2]= *dz;
|
||||
v4[0]= speedfac*dz2[0]+fx; v4[1]= speedfac*dz2[1]+fy+1.0f; v4[2]= *dz;
|
||||
v1[0]= speedfac*dz1[0]+jfx; v1[1]= speedfac*dz1[1]+jfy; v1[2]= *dz;
|
||||
v2[0]= speedfac*dz1[4]+jfx+1.0f; v2[1]= speedfac*dz1[5]+jfy; v2[2]= *dz;
|
||||
v3[0]= speedfac*dz2[4]+jfx+1.0f; v3[1]= speedfac*dz2[5]+jfy+1.0f; v3[2]= *dz;
|
||||
v4[0]= speedfac*dz2[0]+jfx; v4[1]= speedfac*dz2[1]+jfy+1.0f; v4[2]= *dz;
|
||||
}
|
||||
if(*dm==255) col.alpha= 1.0f;
|
||||
else if(*dm<2) col.alpha= 0.0f;
|
||||
@ -3229,26 +3238,59 @@ void RE_zbuf_accumulate_vecblur(NodeBlurData *nbd, int xsize, int ysize, float *
|
||||
dz1+=4;
|
||||
dz2+=4;
|
||||
}
|
||||
|
||||
|
||||
/* blend with a falloff. this fixes the ugly effect you get with
|
||||
* a fast moving object. then it looks like a solid object overlayed
|
||||
* over a very transparent moving version of itself. in reality, the
|
||||
* whole object should become transparent if it is moving fast, be
|
||||
* we don't know what is behind it so we don't do that. this hack
|
||||
* overestimates the contribution of foreground pixels but looks a
|
||||
* bit better without a sudden cutoff. */
|
||||
blendfac= ((samples - step)/(float)samples);
|
||||
/* smoothstep to make it look a bit nicer as well */
|
||||
blendfac= 3.0f*pow(blendfac, 2.0f) - 2.0f*pow(blendfac, 3.0f);
|
||||
|
||||
/* accum */
|
||||
for(dr= rectdraw, dz2=newrect, x= xsize*ysize-1; x>=0; x--, dr++, dz2+=4) {
|
||||
rw= rectweight;
|
||||
rm= rectmax;
|
||||
for(dr= rectdraw, dz2=newrect, x= xsize*ysize-1; x>=0; x--, dr++, dz2+=4, rw++, rm++) {
|
||||
if(dr->colpoin) {
|
||||
float bfac= dr->alpha*blendfac*dr->colpoin[3];
|
||||
float mf= 1.0f - bfac;
|
||||
float bfac= dr->alpha*blendfac;
|
||||
|
||||
dz2[0]= mf*dz2[0] + bfac*dr->colpoin[0];
|
||||
dz2[1]= mf*dz2[1] + bfac*dr->colpoin[1];
|
||||
dz2[2]= mf*dz2[2] + bfac*dr->colpoin[2];
|
||||
dz2[3]= mf*dz2[3] + bfac*dr->colpoin[3];
|
||||
dz2[0] += bfac*dr->colpoin[0];
|
||||
dz2[1] += bfac*dr->colpoin[1];
|
||||
dz2[2] += bfac*dr->colpoin[2];
|
||||
dz2[3] += bfac*dr->colpoin[3];
|
||||
|
||||
*rw += bfac;
|
||||
*rm= MAX2(*rm, bfac);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* blend between original images and accumulated image */
|
||||
rw= rectweight;
|
||||
rm= rectmax;
|
||||
ro= imgrect;
|
||||
dm= rectmove;
|
||||
for(dz2=newrect, x= xsize*ysize-1; x>=0; x--, dz2+=4, ro+=4, rw++, rm++, dm++) {
|
||||
float mfac = *rm;
|
||||
float fac = (*rw == 0.0f)? 0.0f: mfac/(*rw);
|
||||
float nfac = 1.0f - mfac;
|
||||
|
||||
dz2[0]= fac*dz2[0] + nfac*ro[0];
|
||||
dz2[1]= fac*dz2[1] + nfac*ro[1];
|
||||
dz2[2]= fac*dz2[2] + nfac*ro[2];
|
||||
dz2[3]= fac*dz2[3] + nfac*ro[3];
|
||||
}
|
||||
|
||||
MEM_freeN(rectz);
|
||||
MEM_freeN(rectmove);
|
||||
MEM_freeN(rectdraw);
|
||||
MEM_freeN(rectvz);
|
||||
MEM_freeN(rectweight);
|
||||
MEM_freeN(rectmax);
|
||||
if(minvecbufrect) MEM_freeN(vecbufrect); /* rects were swapped! */
|
||||
zbuf_free_span(&zspan);
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1573,6 +1573,18 @@ static void build_uvlayer_menu_vars(CustomData *data, char **menu_string,
|
||||
}
|
||||
}
|
||||
|
||||
void set_wave_uvlayer(void *arg1, void *arg2)
|
||||
{
|
||||
WaveModifierData *wmd=arg1;
|
||||
CustomDataLayer *layer = arg2;
|
||||
|
||||
/*check we have UV layers*/
|
||||
if (wmd->uvlayer_tmp < 1) return;
|
||||
layer = layer + (wmd->uvlayer_tmp-1);
|
||||
|
||||
strcpy(wmd->uvlayer_name, layer->name);
|
||||
}
|
||||
|
||||
void set_displace_uvlayer(void *arg1, void *arg2)
|
||||
{
|
||||
DisplaceModifierData *dmd=arg1;
|
||||
@ -1845,6 +1857,8 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
|
||||
y -= 18;
|
||||
|
||||
if (!isVirtual && (md->type!=eModifierType_Collision)) {
|
||||
uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE); /* only here obdata, the rest of modifiers is ob level */
|
||||
|
||||
uiBlockBeginAlign(block);
|
||||
if (md->type==eModifierType_ParticleSystem) {
|
||||
but = uiDefBut(block, BUT, B_MODIFIER_RECALC, "Convert", lx,(cy-=19),60,19, 0, 0, 0, 0, 0, "Convert the current particles to a mesh object");
|
||||
@ -1860,6 +1874,8 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
|
||||
uiButSetFunc(but, modifiers_copyModifier, ob, md);
|
||||
}
|
||||
uiBlockEndAlign(block);
|
||||
|
||||
uiSetButLock(ob && ob->id.lib, ERROR_LIBDATA_MESSAGE);
|
||||
}
|
||||
|
||||
lx = x + 10;
|
||||
@ -2195,7 +2211,7 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
|
||||
0.0, 1.0, 0, 0, "Set the UV layer to use");
|
||||
MEM_freeN(strtmp);
|
||||
i = CustomData_get_layer_index(fdata, CD_MTFACE);
|
||||
uiButSetFunc(but, set_displace_uvlayer, wmd,
|
||||
uiButSetFunc(but, set_wave_uvlayer, wmd,
|
||||
&fdata->layers[i]);
|
||||
}
|
||||
if(wmd->texmapping == MOD_DISP_MAP_OBJECT) {
|
||||
@ -2544,7 +2560,7 @@ static void editing_panel_modifiers(Object *ob)
|
||||
block= uiNewBlock(&curarea->uiblocks, "editing_panel_modifiers", UI_EMBOSS, UI_HELV, curarea->win);
|
||||
if( uiNewPanel(curarea, block, "Modifiers", "Editing", 640, 0, 318, 204)==0) return;
|
||||
|
||||
uiSetButLock(object_data_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
|
||||
uiSetButLock((ob && ob->id.lib), ERROR_LIBDATA_MESSAGE);
|
||||
uiNewPanelHeight(block, 204);
|
||||
|
||||
uiDefBlockBut(block, modifiers_add_menu, ob, "Add Modifier", 0, 190, 130, 20, "Add a new modifier");
|
||||
@ -6281,6 +6297,11 @@ static void editing_panel_mesh_uvautocalculation(void)
|
||||
row= 180;
|
||||
|
||||
uiDefButBitS(block, TOGN, UVCALC_NO_ASPECT_CORRECT, B_NOP, "Image Aspect",100,row,200,butH,&G.scene->toolsettings->uvcalc_flag, 0, 0, 0, 0, "Scale the UV Unwrapping to correct for the current images aspect ratio");
|
||||
|
||||
row-= butHB+butS;
|
||||
uiDefButBitS(block, TOG, UVCALC_TRANSFORM_CORRECT, B_NOP, "Transform Correction",100,row,200,butH,&G.scene->toolsettings->uvcalc_flag, 0, 0, 0, 0, "Correct for UV distortion while transforming, (only works with edge slide now)");
|
||||
|
||||
row= 180;
|
||||
|
||||
uiBlockBeginAlign(block);
|
||||
uiDefButF(block, NUM,B_UVAUTO_CUBESIZE ,"Cube Size:",315,row,200,butH, &G.scene->toolsettings->uvcalc_cubesize, 0.0001, 100.0, 10, 3, "Defines the cubemap size for cube mapping");
|
||||
|
||||
@ -2350,7 +2350,7 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
|
||||
|
||||
visAct = act->data;
|
||||
|
||||
str= "Visibility %t|Visible %x0|Invisible %x1";
|
||||
str= "Visibility %t|Visible %x0|Invisible %x1|Visible Recursive %x2|Invisible Recursive %x3";
|
||||
|
||||
uiDefButI(block, MENU, B_REDR, str,
|
||||
xco + 10, yco - 24, width - 20, 19, &visAct->flag,
|
||||
@ -3379,7 +3379,8 @@ void logic_buts(void)
|
||||
uiBlockSetEmboss(block, UI_EMBOSSM);
|
||||
uiDefIconButBitS(block, TOG, SENS_DEL, B_DEL_SENS, ICON_X, xco, yco, 22, 19, &sens->flag, 0, 0, 0, 0, "Delete Sensor");
|
||||
if (pin)
|
||||
uiDefIconButBitS(block, ICONTOG, SENS_PIN, B_REDR, (sens->flag & SENS_PIN) ? ICON_PIN_DEHLT:ICON_PIN_HLT, (short)(xco+width-44), yco, 22, 19, &sens->flag, 0, 0, 0, 0, "Display when not linked to a visible states controller");
|
||||
uiDefIconButBitS(block, ICONTOG, SENS_PIN, B_REDR, ICON_PIN_DEHLT, (short)(xco+width-44), yco, 22, 19, &sens->flag, 0, 0, 0, 0, "Display when not linked to a visible states controller");
|
||||
|
||||
uiDefIconButBitS(block, ICONTOG, SENS_SHOW, B_REDR, ICON_RIGHTARROW, (short)(xco+width-22), yco, 22, 19, &sens->flag, 0, 0, 0, 0, "Sensor settings");
|
||||
|
||||
ycoo= yco;
|
||||
@ -3456,7 +3457,7 @@ void logic_buts(void)
|
||||
uiBlockSetEmboss(block, UI_EMBOSSM);
|
||||
uiDefIconButBitS(block, TOG, ACT_DEL, B_DEL_ACT, ICON_X, xco, yco, 22, 19, &act->flag, 0, 0, 0, 0, "Delete Actuator");
|
||||
if (pin)
|
||||
uiDefIconButBitS(block, ICONTOG, ACT_PIN, B_REDR, (act->flag & ACT_PIN) ? ICON_PIN_DEHLT:ICON_PIN_HLT, (short)(xco+width-44), yco, 22, 19, &act->flag, 0, 0, 0, 0, "Display when not linked to a visible states controller");
|
||||
uiDefIconButBitS(block, ICONTOG, ACT_PIN, B_REDR, ICON_PIN_DEHLT, (short)(xco+width-44), yco, 22, 19, &act->flag, 0, 0, 0, 0, "Display when not linked to a visible states controller");
|
||||
uiDefIconButBitS(block, ICONTOG, ACT_SHOW, B_REDR, ICON_RIGHTARROW, (short)(xco+width-22), yco, 22, 19, &act->flag, 0, 0, 0, 0, "Display the actuator");
|
||||
|
||||
if(act->flag & ACT_SHOW) {
|
||||
|
||||
@ -3003,7 +3003,7 @@ void do_effects_panels(unsigned short event)
|
||||
if(ob && (psys=psys_get_current(ob))){
|
||||
if(psys->part) {
|
||||
if(psys->part->id.us>1){
|
||||
if(okee("Make local")){
|
||||
if(okee("Make Single User")){
|
||||
part=psys_copy_settings(psys->part);
|
||||
part->id.us=1;
|
||||
psys->part->id.us--;
|
||||
|
||||
@ -211,6 +211,7 @@ static void load_image_cb(char *str, void *ima_pp_v, void *iuser_v) /* called fr
|
||||
if(GS(tex->id.name)==ID_TE) {
|
||||
BIF_preview_changed(ID_TE);
|
||||
allqueue(REDRAWBUTSSHADING, 0);
|
||||
allqueue(REDRAWVIEW3D, 0);
|
||||
allqueue(REDRAWOOPS, 0);
|
||||
}
|
||||
}
|
||||
|
||||
@ -682,6 +682,18 @@ static void draw_channel_names(void)
|
||||
special= ICON_SEQUENCE;
|
||||
}
|
||||
break;
|
||||
case SPACE_IMAGE:
|
||||
{
|
||||
SpaceImage *sima= sa->spacedata.first;
|
||||
|
||||
if (sima->image)
|
||||
sprintf(name, "Image: %s", sima->image->id.name+2);
|
||||
else
|
||||
sprintf(name, "Image: <None>");
|
||||
|
||||
special= ICON_IMAGE_COL;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
{
|
||||
|
||||
@ -60,6 +60,7 @@
|
||||
#include "BIF_gl.h"
|
||||
#include "BIF_glutil.h"
|
||||
#include "BIF_butspace.h"
|
||||
#include "BIF_drawseq.h"
|
||||
#include "BIF_graphics.h"
|
||||
#include "BIF_interface.h"
|
||||
#include "BIF_mywindow.h"
|
||||
@ -97,6 +98,8 @@
|
||||
void gp_ui_activelayer_cb (void *gpd, void *gpl)
|
||||
{
|
||||
gpencil_layer_setactive(gpd, gpl);
|
||||
|
||||
scrarea_queue_winredraw(curarea);
|
||||
allqueue(REDRAWACTION, 0);
|
||||
}
|
||||
|
||||
@ -108,6 +111,8 @@ void gp_ui_renamelayer_cb (void *gpd_arg, void *gpl_arg)
|
||||
|
||||
BLI_uniquename(&gpd->layers, gpl, "GP_Layer", offsetof(bGPDlayer, info[0]), 128);
|
||||
gpencil_layer_setactive(gpd, gpl);
|
||||
|
||||
scrarea_queue_winredraw(curarea);
|
||||
allqueue(REDRAWACTION, 0);
|
||||
}
|
||||
|
||||
@ -115,6 +120,8 @@ void gp_ui_renamelayer_cb (void *gpd_arg, void *gpl_arg)
|
||||
void gp_ui_addlayer_cb (void *gpd, void *dummy)
|
||||
{
|
||||
gpencil_layer_addnew(gpd);
|
||||
|
||||
scrarea_queue_winredraw(curarea);
|
||||
allqueue(REDRAWACTION, 0);
|
||||
}
|
||||
|
||||
@ -122,6 +129,8 @@ void gp_ui_addlayer_cb (void *gpd, void *dummy)
|
||||
void gp_ui_dellayer_cb (void *gpd, void *dummy)
|
||||
{
|
||||
gpencil_layer_delactive(gpd);
|
||||
|
||||
scrarea_queue_winredraw(curarea);
|
||||
allqueue(REDRAWACTION, 0);
|
||||
}
|
||||
|
||||
@ -132,6 +141,8 @@ void gp_ui_delstroke_cb (void *gpd, void *gpl)
|
||||
|
||||
gpencil_layer_setactive(gpd, gpl);
|
||||
gpencil_frame_delete_laststroke(gpf);
|
||||
|
||||
scrarea_queue_winredraw(curarea);
|
||||
}
|
||||
|
||||
/* delete active frame of active layer */
|
||||
@ -142,6 +153,7 @@ void gp_ui_delframe_cb (void *gpd, void *gpl)
|
||||
gpencil_layer_setactive(gpd, gpl);
|
||||
gpencil_layer_delframe(gpl, gpf);
|
||||
|
||||
scrarea_queue_winredraw(curarea);
|
||||
allqueue(REDRAWACTION, 0);
|
||||
}
|
||||
|
||||
@ -150,6 +162,8 @@ void gp_ui_convertlayer_cb (void *gpd, void *gpl)
|
||||
{
|
||||
gpencil_layer_setactive(gpd, gpl);
|
||||
gpencil_convert_menu();
|
||||
|
||||
scrarea_queue_winredraw(curarea);
|
||||
}
|
||||
|
||||
/* ------- Drawing Code ------- */
|
||||
@ -310,7 +324,7 @@ short draw_gpencil_panel (uiBlock *block, bGPdata *gpd, ScrArea *sa)
|
||||
/* 'view align' button (naming depends on context) */
|
||||
if (sa->spacetype == SPACE_VIEW3D)
|
||||
uiDefButBitI(block, TOG, GP_DATA_VIEWALIGN, B_REDR, "Sketch in 3D", 170, 205, 150, 20, &gpd->flag, 0, 0, 0, 0, "New strokes are added in 3D-space");
|
||||
else if (sa->spacetype != SPACE_SEQ) /* not available for sequencer yet */
|
||||
else
|
||||
uiDefButBitI(block, TOG, GP_DATA_VIEWALIGN, B_REDR, "Stick to View", 170, 205, 150, 20, &gpd->flag, 0, 0, 0, 0, "New strokes are added on 2d-canvas");
|
||||
}
|
||||
|
||||
@ -394,7 +408,7 @@ static void gp_draw_stroke_buffer (tGPspoint *points, int totpoints, short thick
|
||||
/* ----- Existing Strokes Drawing (3D and Point) ------ */
|
||||
|
||||
/* draw a given stroke - just a single dot (only one point) */
|
||||
static void gp_draw_stroke_point (bGPDspoint *points, short thickness, short sflag, int winx, int winy)
|
||||
static void gp_draw_stroke_point (bGPDspoint *points, short thickness, short sflag, int offsx, int offsy, int winx, int winy)
|
||||
{
|
||||
/* draw point */
|
||||
if (sflag & GP_STROKE_3DSPACE) {
|
||||
@ -410,6 +424,10 @@ static void gp_draw_stroke_point (bGPDspoint *points, short thickness, short sfl
|
||||
co[0]= points->x;
|
||||
co[1]= points->y;
|
||||
}
|
||||
else if (sflag & GP_STROKE_2DIMAGE) {
|
||||
co[0]= (points->x * winx) + offsx;
|
||||
co[1]= (points->y * winy) + offsy;
|
||||
}
|
||||
else {
|
||||
co[0]= (points->x / 1000 * winx);
|
||||
co[1]= (points->y / 1000 * winy);
|
||||
@ -473,10 +491,15 @@ static void gp_draw_stroke_3d (bGPDspoint *points, int totpoints, short thicknes
|
||||
/* ----- Fancy 2D-Stroke Drawing ------ */
|
||||
|
||||
/* draw a given stroke in 2d */
|
||||
static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness, short dflag, short sflag, short debug, int winx, int winy)
|
||||
static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness, short dflag, short sflag,
|
||||
short debug, int offsx, int offsy, int winx, int winy)
|
||||
{
|
||||
/* if thickness is less than GP_DRAWTHICKNESS_SPECIAL, 'smooth' opengl lines look better */
|
||||
if (thickness < GP_DRAWTHICKNESS_SPECIAL) {
|
||||
/* if thickness is less than GP_DRAWTHICKNESS_SPECIAL, 'smooth' opengl lines look better
|
||||
* - but NOT if Image Editor 'image-based' stroke
|
||||
*/
|
||||
if ( (thickness < GP_DRAWTHICKNESS_SPECIAL) ||
|
||||
((curarea->spacetype==SPACE_IMAGE) && (dflag & GP_DRAWDATA_ONLYV2D)) )
|
||||
{
|
||||
bGPDspoint *pt;
|
||||
int i;
|
||||
|
||||
@ -485,6 +508,12 @@ static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness,
|
||||
if (sflag & GP_STROKE_2DSPACE) {
|
||||
glVertex2f(pt->x, pt->y);
|
||||
}
|
||||
else if (sflag & GP_STROKE_2DIMAGE) {
|
||||
const float x= (pt->x * winx) + offsx;
|
||||
const float y= (pt->y * winy) + offsy;
|
||||
|
||||
glVertex2f(x, y);
|
||||
}
|
||||
else {
|
||||
const float x= (pt->x / 1000 * winx);
|
||||
const float y= (pt->y / 1000 * winy);
|
||||
@ -494,7 +523,10 @@ static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness,
|
||||
}
|
||||
glEnd();
|
||||
}
|
||||
else { /* tesselation code: currently only enabled with rt != 0 */
|
||||
|
||||
/* tesselation code: currently only enabled with rt != 0 */
|
||||
else
|
||||
{
|
||||
bGPDspoint *pt1, *pt2;
|
||||
float pm[2];
|
||||
int i;
|
||||
@ -514,6 +546,12 @@ static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness,
|
||||
s0[0]= pt1->x; s0[1]= pt1->y;
|
||||
s1[0]= pt2->x; s1[1]= pt2->y;
|
||||
}
|
||||
else if (sflag & GP_STROKE_2DIMAGE) {
|
||||
s0[0]= (pt1->x * winx) + offsx;
|
||||
s0[1]= (pt1->y * winy) + offsy;
|
||||
s1[0]= (pt2->x * winx) + offsx;
|
||||
s1[1]= (pt2->y * winy) + offsy;
|
||||
}
|
||||
else {
|
||||
s0[0]= (pt1->x / 1000 * winx);
|
||||
s0[1]= (pt1->y / 1000 * winy);
|
||||
@ -656,6 +694,12 @@ static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness,
|
||||
if (sflag & GP_STROKE_2DSPACE) {
|
||||
glVertex2f(pt->x, pt->y);
|
||||
}
|
||||
else if (sflag & GP_STROKE_2DIMAGE) {
|
||||
const float x= (pt->x * winx) + offsx;
|
||||
const float y= (pt->y * winy) + offsy;
|
||||
|
||||
glVertex2f(x, y);
|
||||
}
|
||||
else {
|
||||
const float x= (pt->x / 1000 * winx);
|
||||
const float y= (pt->y / 1000 * winy);
|
||||
@ -670,8 +714,8 @@ static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness,
|
||||
/* ----- General Drawing ------ */
|
||||
|
||||
/* draw a set of strokes */
|
||||
static void gp_draw_strokes (bGPDframe *gpf, int winx, int winy, int dflag, short debug,
|
||||
short lthick, float color[4])
|
||||
static void gp_draw_strokes (bGPDframe *gpf, int offsx, int offsy, int winx, int winy, int dflag,
|
||||
short debug, short lthick, float color[4])
|
||||
{
|
||||
bGPDstroke *gps;
|
||||
|
||||
@ -697,16 +741,16 @@ static void gp_draw_strokes (bGPDframe *gpf, int winx, int winy, int dflag, shor
|
||||
|
||||
/* check which stroke-drawer to use */
|
||||
if (gps->totpoints == 1)
|
||||
gp_draw_stroke_point(gps->points, lthick, gps->flag, winx, winy);
|
||||
gp_draw_stroke_point(gps->points, lthick, gps->flag, offsx, offsy, winx, winy);
|
||||
else if (dflag & GP_DRAWDATA_ONLY3D)
|
||||
gp_draw_stroke_3d(gps->points, gps->totpoints, lthick, dflag, gps->flag, debug, winx, winy);
|
||||
else if (gps->totpoints > 1)
|
||||
gp_draw_stroke(gps->points, gps->totpoints, lthick, dflag, gps->flag, debug, winx, winy);
|
||||
gp_draw_stroke(gps->points, gps->totpoints, lthick, dflag, gps->flag, debug, offsx, offsy, winx, winy);
|
||||
}
|
||||
}
|
||||
|
||||
/* draw grease-pencil datablock */
|
||||
static void gp_draw_data (bGPdata *gpd, int winx, int winy, int dflag)
|
||||
static void gp_draw_data (bGPdata *gpd, int offsx, int offsy, int winx, int winy, int dflag)
|
||||
{
|
||||
bGPDlayer *gpl, *actlay=NULL;
|
||||
|
||||
@ -758,7 +802,7 @@ static void gp_draw_data (bGPdata *gpd, int winx, int winy, int dflag)
|
||||
if ((gpf->framenum - gf->framenum) <= gpl->gstep) {
|
||||
/* alpha decreases with distance from curframe index */
|
||||
tcolor[3] = color[3] - (i/gpl->gstep);
|
||||
gp_draw_strokes(gf, winx, winy, dflag, debug, lthick, tcolor);
|
||||
gp_draw_strokes(gf, offsx, offsy, winx, winy, dflag, debug, lthick, tcolor);
|
||||
}
|
||||
else
|
||||
break;
|
||||
@ -770,7 +814,7 @@ static void gp_draw_data (bGPdata *gpd, int winx, int winy, int dflag)
|
||||
if ((gf->framenum - gpf->framenum) <= gpl->gstep) {
|
||||
/* alpha decreases with distance from curframe index */
|
||||
tcolor[3] = color[3] - (i/gpl->gstep);
|
||||
gp_draw_strokes(gf, winx, winy, dflag, debug, lthick, tcolor);
|
||||
gp_draw_strokes(gf, offsx, offsy, winx, winy, dflag, debug, lthick, tcolor);
|
||||
}
|
||||
else
|
||||
break;
|
||||
@ -783,12 +827,12 @@ static void gp_draw_data (bGPdata *gpd, int winx, int winy, int dflag)
|
||||
/* draw the strokes for the ghost frames (at half of the alpha set by user) */
|
||||
if (gpf->prev) {
|
||||
tcolor[3] = (color[3] / 7);
|
||||
gp_draw_strokes(gpf->prev, winx, winy, dflag, debug, lthick, tcolor);
|
||||
gp_draw_strokes(gpf->prev, offsx, offsy, winx, winy, dflag, debug, lthick, tcolor);
|
||||
}
|
||||
|
||||
if (gpf->next) {
|
||||
tcolor[3] = (color[3] / 4);
|
||||
gp_draw_strokes(gpf->next, winx, winy, dflag, debug, lthick, tcolor);
|
||||
gp_draw_strokes(gpf->next, offsx, offsy, winx, winy, dflag, debug, lthick, tcolor);
|
||||
}
|
||||
|
||||
/* restore alpha */
|
||||
@ -798,7 +842,7 @@ static void gp_draw_data (bGPdata *gpd, int winx, int winy, int dflag)
|
||||
|
||||
/* draw the strokes already in active frame */
|
||||
tcolor[3]= color[3];
|
||||
gp_draw_strokes(gpf, winx, winy, dflag, debug, lthick, tcolor);
|
||||
gp_draw_strokes(gpf, offsx, offsy, winx, winy, dflag, debug, lthick, tcolor);
|
||||
|
||||
/* Check if may need to draw the active stroke cache, only if this layer is the active layer
|
||||
* that is being edited. (Stroke buffer is currently stored in gp-data)
|
||||
@ -866,16 +910,69 @@ static void gp_draw_data (bGPdata *gpd, int winx, int winy, int dflag)
|
||||
void draw_gpencil_2dimage (ScrArea *sa, ImBuf *ibuf)
|
||||
{
|
||||
bGPdata *gpd;
|
||||
int dflag = 0;
|
||||
int offsx, offsy, sizex, sizey;
|
||||
int dflag = GP_DRAWDATA_NOSTATUS;
|
||||
|
||||
/* check that we have grease-pencil stuff to draw */
|
||||
if (ELEM(NULL, sa, ibuf)) return;
|
||||
gpd= gpencil_data_getactive(sa);
|
||||
if (gpd == NULL) return;
|
||||
|
||||
/* calculate rect */
|
||||
switch (sa->spacetype) {
|
||||
case SPACE_IMAGE: /* image */
|
||||
{
|
||||
SpaceImage *sima= (SpaceImage *)sa->spacedata.first;
|
||||
|
||||
/* just draw using standard scaling (settings here are currently ignored anyways) */
|
||||
// FIXME: the opengl poly-strokes don't draw at right thickness when done this way, so disabled
|
||||
offsx= 0;
|
||||
offsy= 0;
|
||||
sizex= sa->winx;
|
||||
sizey= sa->winy;
|
||||
|
||||
myortho2(sima->v2d.cur.xmin, sima->v2d.cur.xmax, sima->v2d.cur.ymin, sima->v2d.cur.ymax);
|
||||
|
||||
dflag |= GP_DRAWDATA_ONLYV2D;
|
||||
}
|
||||
break;
|
||||
|
||||
case SPACE_SEQ: /* sequence */
|
||||
{
|
||||
SpaceSeq *sseq= (SpaceSeq *)sa->spacedata.first;
|
||||
float zoom, zoomx, zoomy;
|
||||
|
||||
/* calculate accessory values */
|
||||
zoom= SEQ_ZOOM_FAC(sseq->zoom);
|
||||
if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
|
||||
zoomx = zoom * ((float)G.scene->r.xasp / (float)G.scene->r.yasp);
|
||||
zoomy = zoom;
|
||||
}
|
||||
else
|
||||
zoomx = zoomy = zoom;
|
||||
|
||||
sizex= zoomx * ibuf->x;
|
||||
sizey= zoomy * ibuf->y;
|
||||
offsx= (sa->winx-sizex)/2 + sseq->xof;
|
||||
offsy= (sa->winy-sizey)/2 + sseq->yof;
|
||||
|
||||
dflag |= GP_DRAWDATA_ONLYI2D;
|
||||
}
|
||||
break;
|
||||
|
||||
default: /* for spacetype not yet handled */
|
||||
offsx= 0;
|
||||
offsy= 0;
|
||||
sizex= sa->winx;
|
||||
sizey= sa->winy;
|
||||
|
||||
dflag |= GP_DRAWDATA_ONLYI2D;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
/* draw it! */
|
||||
dflag = (GP_DRAWDATA_ONLYI2D|GP_DRAWDATA_NOSTATUS);
|
||||
gp_draw_data(gpd, sa->winx, sa->winy, dflag);
|
||||
gp_draw_data(gpd, offsx, offsy, sizex, sizey, dflag);
|
||||
}
|
||||
|
||||
/* draw grease-pencil sketches to specified 2d-view assuming that matrices are already set correctly
|
||||
@ -893,7 +990,7 @@ void draw_gpencil_2dview (ScrArea *sa, short onlyv2d)
|
||||
|
||||
/* draw it! */
|
||||
if (onlyv2d) dflag |= (GP_DRAWDATA_ONLYV2D|GP_DRAWDATA_NOSTATUS);
|
||||
gp_draw_data(gpd, sa->winx, sa->winy, dflag);
|
||||
gp_draw_data(gpd, 0, 0, sa->winx, sa->winy, dflag);
|
||||
}
|
||||
|
||||
/* draw grease-pencil sketches to specified 3d-view assuming that matrices are already set correctly
|
||||
@ -910,7 +1007,7 @@ void draw_gpencil_3dview (ScrArea *sa, short only3d)
|
||||
|
||||
/* draw it! */
|
||||
if (only3d) dflag |= (GP_DRAWDATA_ONLY3D|GP_DRAWDATA_NOSTATUS);
|
||||
gp_draw_data(gpd, sa->winx, sa->winy, dflag);
|
||||
gp_draw_data(gpd, 0, 0, sa->winx, sa->winy, dflag);
|
||||
}
|
||||
|
||||
/* draw grease-pencil sketches to opengl render window assuming that matrices are already set correctly */
|
||||
@ -924,7 +1021,7 @@ void draw_gpencil_oglrender (View3D *v3d, int winx, int winy)
|
||||
if (gpd == NULL) return;
|
||||
|
||||
/* pass 1: draw 3d-strokes ------------ > */
|
||||
gp_draw_data(gpd, winx, winy, (GP_DRAWDATA_NOSTATUS|GP_DRAWDATA_ONLY3D));
|
||||
gp_draw_data(gpd, 0, 0, winx, winy, (GP_DRAWDATA_NOSTATUS|GP_DRAWDATA_ONLY3D));
|
||||
|
||||
/* pass 2: draw 2d-strokes ------------ > */
|
||||
/* adjust view matrices */
|
||||
@ -932,7 +1029,7 @@ void draw_gpencil_oglrender (View3D *v3d, int winx, int winy)
|
||||
glLoadIdentity();
|
||||
|
||||
/* draw it! */
|
||||
gp_draw_data(gpd, winx, winy, GP_DRAWDATA_NOSTATUS);
|
||||
gp_draw_data(gpd, 0, 0, winx, winy, GP_DRAWDATA_NOSTATUS);
|
||||
}
|
||||
|
||||
/* ************************************************** */
|
||||
|
||||
@ -52,6 +52,7 @@
|
||||
#include "DNA_camera_types.h"
|
||||
#include "DNA_color_types.h"
|
||||
#include "DNA_image_types.h"
|
||||
#include "DNA_gpencil_types.h"
|
||||
#include "DNA_mesh_types.h"
|
||||
#include "DNA_meshdata_types.h"
|
||||
#include "DNA_node_types.h"
|
||||
@ -79,6 +80,7 @@
|
||||
#include "BDR_editface.h"
|
||||
#include "BDR_drawobject.h"
|
||||
#include "BDR_drawmesh.h"
|
||||
#include "BDR_gpencil.h"
|
||||
#include "BDR_imagepaint.h"
|
||||
|
||||
#include "BIF_cursors.h"
|
||||
@ -86,6 +88,7 @@
|
||||
#include "BIF_graphics.h"
|
||||
#include "BIF_mywindow.h"
|
||||
#include "BIF_drawimage.h"
|
||||
#include "BIF_drawgpencil.h"
|
||||
#include "BIF_resources.h"
|
||||
#include "BIF_interface.h"
|
||||
#include "BIF_interface_icons.h"
|
||||
@ -1778,6 +1781,45 @@ static void image_panel_preview(ScrArea *sa, short cntrl) // IMAGE_HANDLER_PREVI
|
||||
|
||||
}
|
||||
|
||||
static void image_panel_gpencil(short cntrl) // IMAGE_HANDLER_GREASEPENCIL
|
||||
{
|
||||
uiBlock *block;
|
||||
SpaceImage *sima;
|
||||
|
||||
sima= curarea->spacedata.first;
|
||||
|
||||
block= uiNewBlock(&curarea->uiblocks, "image_panel_gpencil", UI_EMBOSS, UI_HELV, curarea->win);
|
||||
uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | cntrl);
|
||||
uiSetPanelHandler(IMAGE_HANDLER_GREASEPENCIL); // for close and esc
|
||||
if (uiNewPanel(curarea, block, "Grease Pencil", "SpaceImage", 100, 30, 318, 204)==0) return;
|
||||
|
||||
/* allocate memory for gpd if drawing enabled (this must be done first or else we crash) */
|
||||
if (sima->flag & SI_DISPGP) {
|
||||
if (sima->gpd == NULL)
|
||||
gpencil_data_setactive(curarea, gpencil_data_addnew());
|
||||
}
|
||||
|
||||
if (sima->flag & SI_DISPGP) {
|
||||
bGPdata *gpd= sima->gpd;
|
||||
short newheight;
|
||||
|
||||
/* this is a variable height panel, newpanel doesnt force new size on existing panels */
|
||||
/* so first we make it default height */
|
||||
uiNewPanelHeight(block, 204);
|
||||
|
||||
/* draw button for showing gpencil settings and drawings */
|
||||
uiDefButBitI(block, TOG, SI_DISPGP, B_REDR, "Use Grease Pencil", 10, 225, 150, 20, &sima->flag, 0, 0, 0, 0, "Display freehand annotations overlay over this Image/UV Editor (draw using Shift-LMB)");
|
||||
|
||||
/* extend the panel if the contents won't fit */
|
||||
newheight= draw_gpencil_panel(block, gpd, curarea);
|
||||
uiNewPanelHeight(block, newheight);
|
||||
}
|
||||
else {
|
||||
uiDefButBitI(block, TOG, SI_DISPGP, B_REDR, "Use Grease Pencil", 10, 225, 150, 20, &sima->flag, 0, 0, 0, 0, "Display freehand annotations overlay over this Image/UV Editor");
|
||||
uiDefBut(block, LABEL, 1, " ", 160, 180, 150, 20, NULL, 0.0, 0.0, 0, 0, "");
|
||||
}
|
||||
}
|
||||
|
||||
static void image_blockhandlers(ScrArea *sa)
|
||||
{
|
||||
SpaceImage *sima= sa->spacedata.first;
|
||||
@ -1788,7 +1830,6 @@ static void image_blockhandlers(ScrArea *sa)
|
||||
|
||||
for(a=0; a<SPACE_MAXHANDLER; a+=2) {
|
||||
switch(sima->blockhandler[a]) {
|
||||
|
||||
case IMAGE_HANDLER_PROPERTIES:
|
||||
image_panel_properties(sima->blockhandler[a+1]);
|
||||
break;
|
||||
@ -1806,7 +1847,10 @@ static void image_blockhandlers(ScrArea *sa)
|
||||
break;
|
||||
case IMAGE_HANDLER_PREVIEW:
|
||||
image_panel_preview(sa, sima->blockhandler[a+1]);
|
||||
break;
|
||||
break;
|
||||
case IMAGE_HANDLER_GREASEPENCIL:
|
||||
image_panel_gpencil(sima->blockhandler[a+1]);
|
||||
break;
|
||||
}
|
||||
/* clear action value for event */
|
||||
sima->blockhandler[a+1]= 0;
|
||||
@ -2339,9 +2383,17 @@ void drawimagespace(ScrArea *sa, void *spacedata)
|
||||
}
|
||||
|
||||
draw_image_transform(ibuf, xuser_asp, yuser_asp);
|
||||
|
||||
/* draw grease-pencil ('image' strokes) */
|
||||
if (sima->flag & SI_DISPGP)
|
||||
draw_gpencil_2dimage(sa, ibuf);
|
||||
|
||||
mywinset(sa->win); /* restore scissor after gla call... */
|
||||
myortho2(-0.375, sa->winx-0.375, -0.375, sa->winy-0.375);
|
||||
|
||||
/* draw grease-pencil (screen strokes) */
|
||||
if (sima->flag & SI_DISPGP)
|
||||
draw_gpencil_2dview(sa, 0);
|
||||
|
||||
if(G.rendering==0) {
|
||||
draw_image_view_tool();
|
||||
|
||||
@ -921,6 +921,13 @@ void drawscroll(int disptype)
|
||||
|
||||
BIF_ThemeColor(TH_TEXT);
|
||||
val= ipogrid_startx;
|
||||
|
||||
if (ELEM3(curarea->spacetype, SPACE_SEQ, SPACE_SOUND, SPACE_TIME)) { /* prevents printing twice same frame */
|
||||
while(ipogrid_dx < 0.9999f) {
|
||||
ipogrid_dx *= 2.0f;
|
||||
dfac*= 2.0f;
|
||||
}
|
||||
}
|
||||
while(fac < hor.xmax) {
|
||||
|
||||
if(curarea->spacetype==SPACE_OOPS) {
|
||||
|
||||
@ -922,17 +922,11 @@ static void draw_image_seq(ScrArea *sa)
|
||||
|
||||
if(ibuf->rect_float && ibuf->rect==NULL)
|
||||
IMB_rect_from_float(ibuf);
|
||||
|
||||
if (sseq->zoom > 0) {
|
||||
zoom = sseq->zoom;
|
||||
} else if (sseq->zoom == 0) {
|
||||
zoom = 1.0;
|
||||
} else {
|
||||
zoom = -1.0/sseq->zoom;
|
||||
}
|
||||
|
||||
|
||||
/* needed for gla draw */
|
||||
glaDefine2DArea(&curarea->winrct);
|
||||
|
||||
zoom= SEQ_ZOOM_FAC(sseq->zoom);
|
||||
if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
|
||||
zoomx = zoom * ((float)G.scene->r.xasp / (float)G.scene->r.yasp);
|
||||
zoomy = zoom;
|
||||
@ -976,7 +970,10 @@ static void draw_image_seq(ScrArea *sa)
|
||||
setlinestyle(0);
|
||||
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
|
||||
}
|
||||
|
||||
|
||||
/* draw grease-pencil (image aligned) */
|
||||
if (sseq->flag & SEQ_DRAW_GPENCIL)
|
||||
draw_gpencil_2dimage(sa, ibuf);
|
||||
|
||||
if (free_ibuf) {
|
||||
IMB_freeImBuf(ibuf);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user