From 8e9148f95fe4f061b8f7e72223f8a1f2ba0ebefb Mon Sep 17 00:00:00 2001
From: Nehon <remy.bouquet@gmail.com>
Date: Sat, 11 Apr 2015 16:14:54 +0200
Subject: [PATCH] Fix for previous too optimistic merge

---
 .nb-gradle-properties                         | 26 -------------------
 gradle.properties                             |  2 +-
 .../java/com/jme3/material/TechniqueDef.java  |  2 +-
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/.nb-gradle-properties b/.nb-gradle-properties
index 9ca0f2c0a1..eba3578eeb 100644
--- 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
index e3651bbe41..00429d65a2 100644
--- 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
index 8ab55fbaca..42b3eeaf1d 100644
--- 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 + '}';
     }   
 
     /**