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 @@ jMonkeyEngine - - - run - no - - run - - - - -ea - - - - run.single - no - - ${project}:run - - - -PmainClass=${selected-class} - - - -ea - - - 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 + '}'; } /**