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

Fixed an issue in the shader node editor where the editor was failing to open a definition when a variable name began with m_

Browse Source
This commit is contained in:
Nehon 2015-08-15 10:30:12 +02:00
parent a09f8a0822
commit 55db59d510
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/NodePanel.java
View File

@ -169,9 +169,12 @@ public class NodePanel extends DraggablePanel implements Selectable, PropertyCha
} }
private Dot getConnectPoint(List<JLabel> list, String varName, List<Dot> listDot) { private Dot getConnectPoint(List<JLabel> list, String varName, List<Dot> listDot) {
if (varName.startsWith("m_") || varName.startsWith("g_")) { //This has been commented out because it was causing issues when a variable name was explicitely starting with m_ or g_ in the j3md.
varName = varName.substring(2); //I can't remember why it was done in the first place, but I can't see any case where the m_ should be stripped out.
} //I'm letting this commented in case this comes to light some day, and something more clever will have to be done.
// if (varName.startsWith("m_") || varName.startsWith("g_")) {
// varName = varName.substring(2);
// }
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
if (list.get(i).getText().equals(varName)) { if (list.get(i).getText().equals(varName)) {
return listDot.get(i); return listDot.get(i);