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

sdk blender plugin: fix settings path for Mac OS X

Browse Source
This commit is contained in:
Kirill Vainer 2015-08-15 13:12:58 -04:00
parent e14c6467ff
commit 3bd52ba4f1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/jme3-blender/src/com/jme3/gde/blender/BlenderTool.java
View File

@ -165,6 +165,14 @@ public class BlenderTool {
} }
} }
private static String getBlenderOsSettingsPath() {
if (Utilities.isMac()) {
return "../blender/blender.app/Contents/Resources";
} else {
return "../blender";
}
}
private static boolean checkBlenderFolders() { private static boolean checkBlenderFolders() {
String jmpDir = Places.getUserDirectory().getAbsolutePath(); String jmpDir = Places.getUserDirectory().getAbsolutePath();
FileObject fileObject = FileUtil.toFileObject(new File(jmpDir)); FileObject fileObject = FileUtil.toFileObject(new File(jmpDir));
@ -251,9 +259,9 @@ public class BlenderTool {
} }
private static File getBlenderSettingsFolder() { private static File getBlenderSettingsFolder() {
File blender = InstalledFileLocator.getDefault().locate(getBlenderOsPath() + "/2.75", null, false); File blender = InstalledFileLocator.getDefault().locate(getBlenderOsSettingsPath() + "/2.75", null, false);
if (blender == null) { if (blender == null) {
blender = InstalledFileLocator.getDefault().locate(getBlenderOsPath() + "/2.69", null, false); blender = InstalledFileLocator.getDefault().locate(getBlenderOsSettingsPath() + "/2.69", null, false);
} }
if (blender == null) { if (blender == null) {
DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message("Error finding Blender settings")); DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message("Error finding Blender settings"));