system_scenes.diff


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20

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
@@ -165,15 +165,7 @@ int main(int argc, char **argv) {
 	else {
 		app.Init(mode, useCPU, devices, optixDevices, 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");