diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-26 13:59:43 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-26 13:59:43 +0400 |
| commit | 4a0351cba2cdc69222a0a2c4bd5905f448abee2b (patch) | |
| tree | 7be6e1a8ae6f2c4df33423c91007a7895bf13ce5 /release | |
| parent | 18d2dd7e3ae0338829fd61740151f41c21668474 (diff) | |
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,
Diffstat (limited to 'release')
| -rwxr-xr-x[-rw-r--r--] | release/bin/blender-softwaregl | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/release/bin/blender-softwaregl b/release/bin/blender-softwaregl index 63e6d9a9658..970a7870760 100644..100755 --- 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 |