2.50:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD Notes: * Game and sequencer RNA, and sequencer header are now out of date a bit after changes in trunk. * I didn't know how to port these bugfixes, most likely they are not needed anymore. * Fix "duplicate strip" always increase the user count for ipo. * IPO pinning on sequencer strips was lost during Undo.
This commit is contained in:
@@ -74,8 +74,8 @@ void GPC_RenderTools::BeginFrame(RAS_IRasterizer* rasty)
|
||||
{
|
||||
m_clientobject = NULL;
|
||||
m_lastlightlayer = -1;
|
||||
m_lastlighting = false;
|
||||
m_lastauxinfo = NULL;
|
||||
m_lastlighting = true; /* force disable in DisableOpenGLLights() */
|
||||
DisableOpenGLLights();
|
||||
}
|
||||
|
||||
@@ -286,10 +286,7 @@ void GPC_RenderTools::RenderText2D(RAS_TEXT_RENDER_MODE mode,
|
||||
int height)
|
||||
{
|
||||
STR_String tmpstr(text);
|
||||
int lines;
|
||||
char* s = tmpstr.Ptr();
|
||||
char* p;
|
||||
|
||||
|
||||
// Save and change OpenGL settings
|
||||
int texture2D;
|
||||
|
||||
Reference in New Issue
Block a user