sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reverted changes in RenderManager from previous commit as they were not meant to be committed and unrelated to the change

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9748 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2012-09-17 20:14:58 +00:00
parent 5111fd8b66
commit eab37f7fce
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/src/core/com/jme3/renderer/RenderManager.java
View File

@ -500,14 +500,11 @@ public class RenderManager {
//else the geom is not rendered //else the geom is not rendered
if (forcedTechnique != null) { if (forcedTechnique != null) {
if (g.getMaterial().getMaterialDef().getTechniqueDef(forcedTechnique) != null) { if (g.getMaterial().getMaterialDef().getTechniqueDef(forcedTechnique) != null) {
RenderState s = forcedRenderState;
forcedRenderState = g.getMaterial().getMaterialDef().getTechniqueDef(forcedTechnique).getRenderState();
tmpTech = g.getMaterial().getActiveTechnique() != null ? g.getMaterial().getActiveTechnique().getDef().getName() : "Default"; tmpTech = g.getMaterial().getActiveTechnique() != null ? g.getMaterial().getActiveTechnique().getDef().getName() : "Default";
g.getMaterial().selectTechnique(forcedTechnique, this); g.getMaterial().selectTechnique(forcedTechnique, this);
// use geometry's material // use geometry's material
g.getMaterial().render(g, this); g.getMaterial().render(g, this);
g.getMaterial().selectTechnique(tmpTech, this); g.getMaterial().selectTechnique(tmpTech, this);
forcedRenderState = s;
//Reverted this part from revision 6197 //Reverted this part from revision 6197
//If forcedTechnique does not exists, and frocedMaterial is not set, the geom MUST NOT be rendered //If forcedTechnique does not exists, and frocedMaterial is not set, the geom MUST NOT be rendered
} else if (forcedMaterial != null) { } else if (forcedMaterial != null) {