diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-08-01 02:57:17 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-08-01 02:57:17 +0400 |
| commit | a4c287ed7d67f47778261392694249daeb54089b (patch) | |
| tree | 3643fee7559a0a83583dbc39813b68ce2a189af2 /source/blender/blenlib/intern/path_util.c | |
| parent | 54472df7507a0f5da027c8f8c41907e0b603385c (diff) | |
OSX/scons: Change Blender bundle datastructures + referennces to match the upcoming codesigning needs
- i used deprecated rules up to now which will break in OSX > 10.9.5 and 10.10 > dp4
- todo: adapt cmake due it will break with this commit
Diffstat (limited to 'source/blender/blenlib/intern/path_util.c')
| -rw-r--r-- | source/blender/blenlib/intern/path_util.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index bcc51fc15a2..a7fa443cfc4 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -1175,7 +1175,13 @@ static bool get_path_local(char *targetpath, const char *folder_name, const char } /* try EXECUTABLE_DIR/2.5x/folder_name - new default directory for local blender installed files */ +#ifdef __APPLE__ + static char osx_resourses[FILE_MAX]; /* due new codesign situation in OSX > 10.9.5 we must move the blender_version dir with contents to Resources */ + sprintf(osx_resourses, "%s../Resources", bprogdir); + return test_path(targetpath, osx_resourses, blender_version_decimal(ver), relfolder); +#else return test_path(targetpath, bprogdir, blender_version_decimal(ver), relfolder); +#endif } /** |