diff options
author | Thomas Dinges <blender@dingto.org> | 2014-03-21 20:22:41 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-03-21 20:22:41 +0400 |
commit | ce5395868fde010e39d0e2db2e48aa4d84d9a40a (patch) | |
tree | 0186041af1f45e8cc84a440c64efcecdeb2827b9 /intern/cycles/util | |
parent | 12ce5ae5be97fbe73fcf6b0d49ae7f7765124be9 (diff) |
Cycles Standalone: Support for relative paths and string OSL parameters.
Patch by John Haddon.
Differential Revision: https://developer.blender.org/D418
Diffstat (limited to 'intern/cycles/util')
-rw-r--r-- | intern/cycles/util/util_path.cpp | 5 | ||||
-rw-r--r-- | intern/cycles/util/util_path.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp index 4fd5df4316d..85d19b6a325 100644 --- a/intern/cycles/util/util_path.cpp +++ b/intern/cycles/util/util_path.cpp @@ -111,6 +111,11 @@ string path_escape(const string& path) return result; } +bool path_is_relative(const string& path) +{ + return to_boost(path).is_relative(); +} + bool path_exists(const string& path) { return boost::filesystem::exists(to_boost(path)); diff --git a/intern/cycles/util/util_path.h b/intern/cycles/util/util_path.h index e9041e63dae..fd9ea11740d 100644 --- a/intern/cycles/util/util_path.h +++ b/intern/cycles/util/util_path.h @@ -41,6 +41,7 @@ string path_filename(const string& path); string path_dirname(const string& path); string path_join(const string& dir, const string& file); string path_escape(const string& path); +bool path_is_relative(const string& path); /* file info */ bool path_exists(const string& path); |