From e76e770d17df382d7014a1a467fc9ba18c7ff7b7 Mon Sep 17 00:00:00 2001 From: pspeed42 Date: Fri, 11 Jul 2014 01:38:14 -0400 Subject: [PATCH] Modified the multi-slot buffer support to work even if the buffer is not instanced. Saw no real reason not to and it makes buffer support more flexible. --- .../main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java b/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java index e3e9393f3..b093467fc 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java +++ b/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java @@ -2226,7 +2226,6 @@ public class LwjglRenderer implements Renderer { } } - int slotsRequired = 1; if (vb.isInstanced()) { if (!ctxCaps.GL_ARB_instanced_arrays || !ctxCaps.GL_ARB_draw_instanced) { @@ -2234,7 +2233,10 @@ public class LwjglRenderer implements Renderer { + "but not supported by the " + "graphics hardware"); } - if (vb.getNumComponents() > 4 && vb.getNumComponents() % 4 != 0) { + } + int slotsRequired = 1; + if (vb.getNumComponents() > 4) { + if (vb.getNumComponents() % 4 != 0) { throw new RendererException("Number of components in multi-slot " + "buffers must be divisible by 4"); }