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

Fix to colorband loading. Preventing a crash when less than 4 cursors are used.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9691 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Kae..pl 2012-08-28 10:10:42 +00:00
parent 0fd34d3535
commit 4fb6ba58c7
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
engine/src/blender/com/jme3/scene/plugins/blender/textures/ColorBand.java
View File

@ -154,10 +154,10 @@ public class ColorBand {
float[] ipoFactors = new float[4]; float[] ipoFactors = new float[4];
float f; float f;
ColorBandData data0 = cbDataMap.get(currentCursor - 2); ColorBandData data0 = this.getColorbandData(currentCursor - 2, cbDataMap);
ColorBandData data1 = cbDataMap.get(currentCursor - 1); ColorBandData data1 = this.getColorbandData(currentCursor - 1, cbDataMap);
ColorBandData data2 = cbDataMap.get(currentCursor); ColorBandData data2 = this.getColorbandData(currentCursor, cbDataMap);
ColorBandData data3 = cbDataMap.get(currentCursor + 1); ColorBandData data3 = this.getColorbandData(currentCursor + 1, cbDataMap);
for (int i = 0; i < result.length; ++i) { for (int i = 0; i < result.length; ++i) {
if (data2.pos != data1.pos) { if (data2.pos != data1.pos) {
@ -234,6 +234,14 @@ public class ColorBand {
} }
return result; return result;
} }
private ColorBandData getColorbandData(int index, Map<Integer, ColorBandData> cbDataMap) {
ColorBandData result = cbDataMap.get(index);
if(result == null) {
result = new ColorBandData();
}
return result;
}
/** /**
* This method returns the data for either B-spline of Cardinal * This method returns the data for either B-spline of Cardinal
@ -272,6 +280,11 @@ public class ColorBand {
public final float r, g, b, a; public final float r, g, b, a;
public int pos; public int pos;
public ColorBandData() {
r = g = b = 0;
a = 1;
}
/** /**
* Copy constructor. * Copy constructor.
*/ */