From 4a0351cba2cdc69222a0a2c4bd5905f448abee2b Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 26 Mar 2013 09:59:43 +0000 Subject: Freestyle changes: - Revert some stylistic changes made in branch They weren't directly related on freestyle project and better be handled in trunk. Helps reading patches ad prevents possible merge conflicts. - Solved issue introduced with recent deprecation of RenderData.maximize, --- release/bin/blender-softwaregl | 50 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) mode change 100644 => 100755 release/bin/blender-softwaregl (limited to 'release') diff --git a/release/bin/blender-softwaregl b/release/bin/blender-softwaregl old mode 100644 new mode 100755 index 63e6d9a9658..970a7870760 --- a/release/bin/blender-softwaregl +++ b/release/bin/blender-softwaregl @@ -1,25 +1,25 @@ -#!/bin/sh -BF_DIST_BIN=`dirname "$0"` -BF_PROGRAM="blender" # BF_PROGRAM=`basename "$0"`-bin -exitcode=0 - -LD_LIBRARY_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH} - -if [ -n "$LD_LIBRARYN32_PATH" ]; then - LD_LIBRARYN32_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARYN32_PATH} -fi -if [ -n "$LD_LIBRARYN64_PATH" ]; then - LD_LIBRARYN64_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARYN64_PATH} -fi -if [ -n "$LD_LIBRARY_PATH_64" ]; then - LD_LIBRARY_PATH_64=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH_64} -fi - -# Workaround for half-transparent windows when compiz is enabled -XLIB_SKIP_ARGB_VISUALS=1 - -export LD_LIBRARY_PATH LD_LIBRARYN32_PATH LD_LIBRARYN64_PATH LD_LIBRARY_PATH_64 LD_PRELOAD XLIB_SKIP_ARGB_VISUALS - -"$BF_DIST_BIN/$BF_PROGRAM" ${1+"$@"} -exitcode=$? -exit $exitcode +#!/bin/sh +BF_DIST_BIN=`dirname "$0"` +BF_PROGRAM="blender" # BF_PROGRAM=`basename "$0"`-bin +exitcode=0 + +LD_LIBRARY_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH} + +if [ -n "$LD_LIBRARYN32_PATH" ]; then + LD_LIBRARYN32_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARYN32_PATH} +fi +if [ -n "$LD_LIBRARYN64_PATH" ]; then + LD_LIBRARYN64_PATH=${BF_DIST_BIN}/lib:${LD_LIBRARYN64_PATH} +fi +if [ -n "$LD_LIBRARY_PATH_64" ]; then + LD_LIBRARY_PATH_64=${BF_DIST_BIN}/lib:${LD_LIBRARY_PATH_64} +fi + +# Workaround for half-transparent windows when compiz is enabled +XLIB_SKIP_ARGB_VISUALS=1 + +export LD_LIBRARY_PATH LD_LIBRARYN32_PATH LD_LIBRARYN64_PATH LD_LIBRARY_PATH_64 LD_PRELOAD XLIB_SKIP_ARGB_VISUALS + +"$BF_DIST_BIN/$BF_PROGRAM" ${1+"$@"} +exitcode=$? +exit $exitcode -- cgit v1.2.3