mirror of
https://github.com/bkaradzic/bgfx.git
synced 2026-02-21 14:23:02 +01:00
Merge branch 'master' into encoder
This commit is contained in:
@@ -36,9 +36,13 @@ function overridefiles(_srcPath, _dstPath, _files)
|
||||
end
|
||||
|
||||
function bgfxProject(_name, _kind, _defines)
|
||||
|
||||
project ("bgfx" .. _name)
|
||||
uuid (os.uuid("bgfx" .. _name))
|
||||
bgfxProjectBase(_kind, _defines)
|
||||
copyLib()
|
||||
end
|
||||
|
||||
function bgfxProjectBase(_kind, _defines)
|
||||
kind (_kind)
|
||||
|
||||
if _kind == "SharedLib" then
|
||||
@@ -223,6 +227,4 @@ function bgfxProject(_name, _kind, _defines)
|
||||
end
|
||||
|
||||
configuration {}
|
||||
|
||||
copyLib()
|
||||
end
|
||||
|
||||
@@ -6947,7 +6947,7 @@ namespace bgfx { namespace gl
|
||||
scissorRect.setIntersect(viewScissorRect, _render->m_frameCache.m_rectCache.m_cache[scissor]);
|
||||
if (scissorRect.isZeroArea() )
|
||||
{
|
||||
continue;
|
||||
//continue;
|
||||
}
|
||||
|
||||
GL_CHECK(glEnable(GL_SCISSOR_TEST) );
|
||||
|
||||
Reference in New Issue
Block a user