Skip to content

Commit 49a9a6f

Browse files
committed
fix renderer crash due to merge
1 parent 2e4148f commit 49a9a6f

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -975,12 +975,12 @@ protected void updateUniform(Shader shader, Uniform uniform) {
975975
gl.glUniform1i(loc, b.booleanValue() ? GL.GL_TRUE : GL.GL_FALSE);
976976
break;
977977
case Matrix3:
978-
fb = (FloatBuffer) uniform.getValue();
978+
fb = uniform.getMultiData();
979979
assert fb.remaining() == 9;
980980
gl.glUniformMatrix3(loc, false, fb);
981981
break;
982982
case Matrix4:
983-
fb = (FloatBuffer) uniform.getValue();
983+
fb = uniform.getMultiData();
984984
assert fb.remaining() == 16;
985985
gl.glUniformMatrix4(loc, false, fb);
986986
break;
@@ -989,23 +989,23 @@ protected void updateUniform(Shader shader, Uniform uniform) {
989989
gl.glUniform1(loc, ib);
990990
break;
991991
case FloatArray:
992-
fb = (FloatBuffer) uniform.getValue();
992+
fb = uniform.getMultiData();
993993
gl.glUniform1(loc, fb);
994994
break;
995995
case Vector2Array:
996-
fb = (FloatBuffer) uniform.getValue();
996+
fb = uniform.getMultiData();
997997
gl.glUniform2(loc, fb);
998998
break;
999999
case Vector3Array:
1000-
fb = (FloatBuffer) uniform.getValue();
1000+
fb = uniform.getMultiData();
10011001
gl.glUniform3(loc, fb);
10021002
break;
10031003
case Vector4Array:
1004-
fb = (FloatBuffer) uniform.getValue();
1004+
fb = uniform.getMultiData();
10051005
gl.glUniform4(loc, fb);
10061006
break;
10071007
case Matrix4Array:
1008-
fb = (FloatBuffer) uniform.getValue();
1008+
fb = uniform.getMultiData();
10091009
gl.glUniformMatrix4(loc, false, fb);
10101010
break;
10111011
case Int:

0 commit comments

Comments
 (0)