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

Fix for previous too optimistic merge

Browse Source
This commit is contained in:
Nehon 2015-04-11 16:14:54 +02:00
parent e1d0e06c59
commit 8e9148f95f
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.nb-gradle-properties
View File

@ -6,30 +6,4 @@
<template>license.txt</template> <template>license.txt</template>
<property name="organization">jMonkeyEngine</property> <property name="organization">jMonkeyEngine</property>
</license-header> </license-header>
<built-in-tasks>
<task>
<display-name>run</display-name>
<non-blocking>no</non-blocking>
<task-names>
<name must-exist="no">run</name>
</task-names>
<task-args/>
<task-jvm-args>
<arg>-ea</arg>
</task-jvm-args>
</task>
<task>
<display-name>run.single</display-name>
<non-blocking>no</non-blocking>
<task-names>
<name must-exist="no">${project}:run</name>
</task-names>
<task-args>
<arg>-PmainClass=${selected-class}</arg>
</task-args>
<task-jvm-args>
<arg>-ea</arg>
</task-jvm-args>
</task>
</built-in-tasks>
</gradle-project-properties> </gradle-project-properties>

2
gradle.properties
View File

@ -6,7 +6,7 @@ jmeMainVersion = 3.1
jmeVersionTag = snapshot-github jmeVersionTag = snapshot-github
# specify if JavaDoc should be built # specify if JavaDoc should be built
buildJavaDoc = false buildJavaDoc = true
# specify if SDK and Native libraries get built # specify if SDK and Native libraries get built
buildSdkProject = true buildSdkProject = true

2
jme3-core/src/main/java/com/jme3/material/TechniqueDef.java
View File

@ -544,7 +544,7 @@ public class TechniqueDef implements Savable {
//todo: make toString return something usefull //todo: make toString return something usefull
@Override @Override
public String toString() { public String toString() {
return "TechniqueDef{" + "requiredCaps=" + requiredCaps + ", name=" + name /*+ ", vertName=" + vertName + ", fragName=" + fragName + ", vertLanguage=" + vertLanguage + ", fragLanguage=" + fragLanguage */+ ", presetDefines=" + presetDefines + ", usesShaders=" + usesShaders + ", usesNodes=" + usesNodes + ", shaderNodes=" + shaderNodes + ", shaderGenerationInfo=" + shaderGenerationInfo + ", renderState=" + renderState + ", forcedRenderState=" + forcedRenderState + ", lightMode=" + lightMode + ", shadowMode=" + shadowMode + ", defineParams=" + defineParams + ", worldBinds=" + worldBinds + '}'; return "TechniqueDef{" + "requiredCaps=" + requiredCaps + ", name=" + name /*+ ", vertName=" + vertName + ", fragName=" + fragName + ", vertLanguage=" + vertLanguage + ", fragLanguage=" + fragLanguage */+ ", presetDefines=" + presetDefines + ", usesNodes=" + usesNodes + ", shaderNodes=" + shaderNodes + ", shaderGenerationInfo=" + shaderGenerationInfo + ", renderState=" + renderState + ", forcedRenderState=" + forcedRenderState + ", lightMode=" + lightMode + ", shadowMode=" + shadowMode + ", defineParams=" + defineParams + ", worldBinds=" + worldBinds + '}';
} }
/** /**