pviktori / rpms / blender

Forked from rpms/blender 5 years ago
Clone
e67dc1c
diff -Naur blender-2.78a.old/intern/ghost/intern/GHOST_SystemPathsUnix.cpp blender-2.78a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp
e67dc1c
--- blender-2.78a.old/intern/ghost/intern/GHOST_SystemPathsUnix.cpp	2017-01-29 23:04:06.462691400 +0100
e67dc1c
+++ blender-2.78a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp	2017-01-29 23:12:27.057495546 +0100
e67dc1c
@@ -61,6 +61,9 @@
e67dc1c
 
e67dc1c
 const GHOST_TUns8 *GHOST_SystemPathsUnix::getSystemDir(int, const char *versionstr) const
e67dc1c
 {
e67dc1c
+	/* ignore versionstr when building the system path */
e67dc1c
+	versionstr = "";
e67dc1c
+
e67dc1c
 	/* no prefix assumes a portable build which only uses bundled scripts */
e67dc1c
 	if (static_path) {
e67dc1c
 		static string system_path = string(static_path) + "/blender/" + versionstr;
e67dc1c
diff -Naur blender-2.78a.old/source/creator/CMakeLists.txt blender-2.78a/source/creator/CMakeLists.txt
e67dc1c
--- blender-2.78a.old/source/creator/CMakeLists.txt	2017-01-29 23:12:09.267182657 +0100
e67dc1c
+++ blender-2.78a/source/creator/CMakeLists.txt	2017-01-29 23:12:27.058495563 +0100
e67dc1c
@@ -306,7 +306,7 @@
e67dc1c
 		if(WITH_INSTALL_PORTABLE)
e67dc1c
 			set(TARGETDIR_VER ${BLENDER_VERSION})
e67dc1c
 		else()
e67dc1c
-			set(TARGETDIR_VER share/blender/${BLENDER_VERSION})
e67dc1c
+			set(TARGETDIR_VER share/blender)
e67dc1c
 		endif()
e67dc1c
 	endif()
e67dc1c