[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14472] trunk/blender/source/blender: reversing accidental change to epy_docgen.sh, show world shading Paper button when Blend is disabled, ( own oversight in last commit).

[Campbell Barton]

Revision: 14472
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14472
Author:   campbellbarton
Date:     2008-04-19 01:23:43 +0200 (Sat, 19 Apr 2008)

Log Message:
-----------
reversing accidental change to epy_docgen.sh, show world shading Paper button when Blend is disabled, (own oversight in last commit).

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/doc/epy_docgen.sh
    trunk/blender/source/blender/src/buttons_shading.c

Modified: trunk/blender/source/blender/python/api2_2x/doc/epy_docgen.sh
===================================================================
--- trunk/blender/source/blender/python/api2_2x/doc/epy_docgen.sh	2008-04-18 23:04:54 UTC (rev 14471)
+++ trunk/blender/source/blender/python/api2_2x/doc/epy_docgen.sh	2008-04-18 23:23:43 UTC (rev 14472)
@@ -1,29 +1,12 @@
-#!/bin/bash
 # epy_docgen.sh
 # generates blender python doc using epydoc
 # requires epydoc in your PATH.
 # run from the doc directory containing the .py files
-# usage: ./epy_docgen.sh
+# usage:  sh epy_docgen.sh
 
-# force posix locale so [A-Z]*.py glob uses ASCII ordering
-LC_COLLATE=POSIX
+# set posix locale so regex works properly for [A-Z]*.py
+LC_ALL=POSIX
 
-EPY_VER=$( epydoc --version | sed -e "s/^.* version //" )
-case $EPY_VER in
-    3*)
-        EPY_PARAMS="--top API_intro --name \"Blender\""
-        ;;
-
-    [12]*)
-        EPY_PARAMS="-t API_intro.py -n \"Blender\""
-        ;;
-
-    *)
-        echo ERROR: Unknown epydoc version
-        exit 1
-        ;;
-
-esac
-
-epydoc -o BPY_API --url "http://www.blender.org" -n "Blender" \
- --no-private --no-frames $EPY_PARAMS [A-Z]*.py
+epydoc -o BPY_API --url "http://www.blender.org" -t API_intro.py \
+ -n "Blender" --no-private --no-frames \
+$( ls [A-Z]*.py )

Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c	2008-04-18 23:04:54 UTC (rev 14471)
+++ trunk/blender/source/blender/src/buttons_shading.c	2008-04-18 23:23:43 UTC (rev 14472)
@@ -2337,9 +2337,9 @@
 
 	uiBlockBeginAlign(block);
 	uiDefButBitS(block, TOG, WO_SKYBLEND, B_WORLDPRV,"Blend", 220,175,100,25, &wrld->skytype, 0, 0, 0, 0, "Renders background with natural progression from horizon to zenith");
+	uiDefButBitS(block, TOG,WO_SKYPAPER, B_WORLDPRV,"Paper", 220,150,100,25, &wrld->skytype, 0, 0, 0, 0, "Flattens blend or texture coordinates");
 	if (wrld->skytype & WO_SKYBLEND) {
-		uiDefButBitS(block, TOG, WO_SKYREAL, B_WORLDPRV,"Real", 220,150,50,25, &wrld->skytype, 0, 0, 0, 0, "Renders background with a real horizon");
-		uiDefButBitS(block, TOG,WO_SKYPAPER, B_WORLDPRV,"Paper",270,150,50,25, &wrld->skytype, 0, 0, 0, 0, "Flattens blend or texture coordinates");
+		uiDefButBitS(block, TOG, WO_SKYREAL, B_WORLDPRV,"Real", 220,125,100,25, &wrld->skytype, 0, 0, 0, 0, "Renders background with a real horizon");
 	}
 	uiBlockEndAlign(block);