ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc fixes, null crash on invalid billboards, some non-weather particle emitters incorrectly created with Y randomization

Browse Source
This commit is contained in:
Marianne Gagnon
2014-08-16 15:26:39 -04:00
parent 3e3a27252a
commit 5ed8358505
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/particle_emitter.cpp
View File

@@ -450,7 +450,7 @@ void ParticleEmitter::setParticleType(const ParticleKind* type)
else
{
if (m_is_glsl)
m_node = ParticleSystemProxy::addParticleNode(m_is_glsl, true);
m_node = ParticleSystemProxy::addParticleNode(m_is_glsl, false);
else
m_node = irr_driver->addParticleNode();

2
src/graphics/stkbillboard.cpp
View File

@@ -47,6 +47,8 @@ void STKBillboard::render()
core::vector3df pos = getAbsolutePosition();
glBindVertexArray(billboardvao);
video::ITexture *tex = Material.getTexture(0);
if (tex == NULL)
return;
compressTexture(tex, true, true);
GLuint texid = getTextureGLuint(tex);
setTexture(0, texid, GL_LINEAR, GL_LINEAR);