瀏覽代碼

Fixes #20. Updated Blender's Settings Dir and added a README so you don't forget it each time you update Blender.
Also updated gitignore to not exclude important folders such as that read me one.

MeFisto94 9 年之前
父節點
當前提交
3c32355c35
共有 3 個文件被更改,包括 10 次插入2 次删除
  1. 3 1
      .gitignore
  2. 4 1
      jme3-blender/src/com/jme3/gde/blender/BlenderTool.java
  3. 3 0
      nbi/stub/ext/infra/build/products/README

+ 3 - 1
.gitignore

@@ -16,7 +16,9 @@ JME3TestsTemplateAndroid/src/META-INF
 jme3-project-baselibs/src/com/jme3/gde/project/baselibs
 jme3-core-baselibs/nbproject/project.xml
 jme3-core-libraries/nbproject/project.xml
-build
+build/*
+*/build/*
+*.class
 .gradle
 netbeans
 */nbproject/private/*

+ 4 - 1
jme3-blender/src/com/jme3/gde/blender/BlenderTool.java

@@ -259,7 +259,10 @@ public class BlenderTool {
     }
 
     private static File getBlenderSettingsFolder() {
-        File blender = InstalledFileLocator.getDefault().locate(getBlenderOsSettingsPath() + "/2.75", null, false);
+        File blender = InstalledFileLocator.getDefault().locate(getBlenderOsSettingsPath() + "/2.76", null, false); /* Update this every new Blender Version you use */
+        if (blender == null) {
+            blender = InstalledFileLocator.getDefault().locate(getBlenderOsSettingsPath() + "/2.75", null, false);
+        }
         if (blender == null) {
             blender = InstalledFileLocator.getDefault().locate(getBlenderOsSettingsPath() + "/2.69", null, false);
         }

+ 3 - 0
nbi/stub/ext/infra/build/products/README

@@ -0,0 +1,3 @@
+Updating Bundled Products:
+a) To update the JDK edit ~/jdks/download-jdks.sh and make sure to clean any caches (on CI-Systems like Travis) or delete the file links in ~/jdks/ 
+b) When you update Blender (you already have the folder for that), make sure to also update jme3-blender/src/com/jme3/gde/blender/BlenderTool.java. It contains a getSettings method which WILL break each update. See #20