summarylogtreecommitdiffstats
path: root/system_scenes.diff
diff options
context:
space:
mode:
Diffstat (limited to 'system_scenes.diff')
-rw-r--r--system_scenes.diff21
1 files changed, 21 insertions, 0 deletions
diff --git a/system_scenes.diff b/system_scenes.diff
new file mode 100644
index 000000000000..f55ec1951643
--- /dev/null
+++ b/system_scenes.diff
@@ -0,0 +1,21 @@
+diff -rup luxrender-luxmark-985b948aa5c7/src/main.cpp luxrender-luxmark-985b948aa5c7.new/src/main.cpp
+--- luxrender-luxmark-985b948aa5c7/src/main.cpp 2015-02-25 10:46:48.000000000 +0100
++++ luxrender-luxmark-985b948aa5c7.new/src/main.cpp 2015-03-12 23:01:53.971856726 +0100
+@@ -125,16 +125,7 @@ int main(int argc, char **argv) {
+ return EXIT_SUCCESS;
+ else {
+ app.Init(mode, scnName, singleRun, singleRunExtInfo);
+-
+- // If current directory doesn't have the "scenes" directory, move
+- // to where the executable is
+- if (!boost::filesystem::exists("./scenes")) {
+- // Look for the directory where LuxMark executable is installed
+- boost::filesystem::path exePath(boost::filesystem::initial_path<boost::filesystem::path>());
+- exePath = boost::filesystem::system_complete(boost::filesystem::path(argv[0])).parent_path();
+- // Set the current directory to where the binary is
+- boost::filesystem::current_path(exePath);
+- }
++ boost::filesystem::current_path("/usr/share/luxmark");
+
+ // Force C locale
+ setlocale(LC_NUMERIC, "C");