diff options
Diffstat (limited to 'release')
-rw-r--r-- | release/bin/blender-softwaregl | 25 | ||||
-rw-r--r-- | release/scripts/startup/bl_operators/freestyle.py | 7 |
2 files changed, 29 insertions, 3 deletions
diff --git a/release/bin/blender-softwaregl b/release/bin/blender-softwaregl new file mode 100644 index 00000000000..63e6d9a9658 --- /dev/null +++ b/release/bin/blender-softwaregl @@ -0,0 +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
diff --git a/release/scripts/startup/bl_operators/freestyle.py b/release/scripts/startup/bl_operators/freestyle.py index 49e6249cacd..985676aa86c 100644 --- a/release/scripts/startup/bl_operators/freestyle.py +++ b/release/scripts/startup/bl_operators/freestyle.py @@ -22,14 +22,15 @@ from bpy.props import (EnumProperty, StringProperty) class SCENE_OT_freestyle_fill_range_by_selection(bpy.types.Operator): - '''Fill the Range Min/Max entries by the min/max distance between selected mesh objects and the source object (either a user-specified object or the active camera)''' + '''Fill the Range Min/Max entries by the min/max distance between selected mesh objects and the source object + (either a user-specified object or the active camera)''' bl_idname = "scene.freestyle_fill_range_by_selection" bl_label = "Fill Range by Selection" type = EnumProperty(name="Type", description="Type of the modifier to work on", - items=[("COLOR", "Color", "Color modifier type"), + items=(("COLOR", "Color", "Color modifier type"), ("ALPHA", "Alpha", "Alpha modifier type"), - ("THICKNESS", "Thickness", "Thickness modifier type")]) + ("THICKNESS", "Thickness", "Thickness modifier type"))) name = StringProperty(name="Name", description="Name of the modifier to work on") def execute(self, context): |