From e0ee6854669b46d41a85b0757dc0f12c94811538 Mon Sep 17 00:00:00 2001 From: pspeed42 Date: Tue, 12 Aug 2014 16:31:06 -0400 Subject: [PATCH] Added a second vect4f to tempvars so renamed the first one to follow other conventions. Seems like Material is the only thing using it (and I think it could get away with a vec3 really but no harm done). --- jme3-core/src/main/java/com/jme3/material/Material.java | 2 +- jme3-core/src/main/java/com/jme3/util/TempVars.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/material/Material.java b/jme3-core/src/main/java/com/jme3/material/Material.java index 2f0bdb476..c0d7d11e8 100644 --- a/jme3-core/src/main/java/com/jme3/material/Material.java +++ b/jme3-core/src/main/java/com/jme3/material/Material.java @@ -841,7 +841,7 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable { Quaternion tmpLightDirection = vars.quat1; Quaternion tmpLightPosition = vars.quat2; ColorRGBA tmpLightColor = vars.color; - Vector4f tmpVec = vars.vect4f; + Vector4f tmpVec = vars.vect4f1; ColorRGBA color = l.getColor(); tmpLightColor.set(color); diff --git a/jme3-core/src/main/java/com/jme3/util/TempVars.java b/jme3-core/src/main/java/com/jme3/util/TempVars.java index 54f56243b..a7bd088b8 100644 --- a/jme3-core/src/main/java/com/jme3/util/TempVars.java +++ b/jme3-core/src/main/java/com/jme3/util/TempVars.java @@ -179,7 +179,8 @@ public class TempVars { public final Vector3f vect8 = new Vector3f(); public final Vector3f vect9 = new Vector3f(); public final Vector3f vect10 = new Vector3f(); - public final Vector4f vect4f = new Vector4f(); + public final Vector4f vect4f1 = new Vector4f(); + public final Vector4f vect4f2 = new Vector4f(); public final Vector3f[] tri = {new Vector3f(), new Vector3f(), new Vector3f()};