Fix for previous too optimistic merge

jMonkeyEngine · Apr 11, 2015 · 8e9148f · 8e9148f
1 parent e1d0e06
commit 8e9148f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 28 deletions.
diff --git a/.nb-gradle-properties b/.nb-gradle-properties
@@ -6,30 +6,4 @@
     <template>license.txt</template>
     <property name="organization">jMonkeyEngine</property>
   </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>
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ jmeMainVersion = 3.1
 jmeVersionTag = snapshot-github
 
 # specify if JavaDoc should be built
-buildJavaDoc = false
+buildJavaDoc = true
 
 # specify if SDK and Native libraries get built
 buildSdkProject = true

diff --git a/jme3-core/src/main/java/com/jme3/material/TechniqueDef.java b/jme3-core/src/main/java/com/jme3/material/TechniqueDef.java
@@ -544,7 +544,7 @@ public void setShaderGenerationInfo(ShaderGenerationInfo shaderGenerationInfo) {
     //todo: make toString return something usefull
     @Override
     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 + '}';
     }   
 
     /**