soc-2008-mxcurioni: merged changes to revision 14747, cosmetic changes for source/blender/freestyle

source/blender/python/api2_2x/doc/Material.py

@@ -237,6 +237,18 @@ class Material:
 	@ivar rayMirr:  Mirror reflection amount for raytrace.
 	Value is clamped to the range [0.0,1.0].
 	@type rayMirr:  float
+	@ivar glossMir: Amount of reflection glossy.
+	Value is clamped to the range [0.0,1.0].
+	@type glossMir: float
+	@ivar sampGloss_mir: Reflection glossy samples.
+	Value is clamped to the range [1,1024].
+	@type sampGloss_mir: int
+	@ivar glossTra: Amount of refraction glossy.
+	Value is clamped to the range [0.0,1.0].
+	@type glossTra: float
+	@ivar sampGlossTra: Refraction glossy samples.
+	Value is clamped to the range [1,1024].
+	@type sampGlossTra: int
 	@ivar rayMirrDepth:  Amount of raytrace inter-reflections.
 	Value is clamped to the range [0,10].
 	@type rayMirrDepth:  int

source/blender/python/api2_2x/doc/Sys.py

@@ -153,7 +153,7 @@ def expandpath (path):
   Internally, Blender recognizes two special character sequences in paths:
     - '//' (used at the beginning): means base path -- the current .blend file's
       dir;
-    - '#' (used at the end): means current frame number.
+    - '#' characters in the filename will be replaced by the frame number.
   The expanded string can be passed to generic python functions that don't
   understand Blender's internal relative paths.
   @note: this function is also useful for obtaining the name of the image
@@ -165,3 +165,12 @@ def expandpath (path):
   @rtype: string
   @return: the expanded (if necessary) path.
   """
+
+def cleanpath (path):
+  """
+  Clean the given 'path' by removing unneeded components such as "/./" and "/test/../"
+  @type path: string
+  @param path: a path name.
+  @rtype: string
+  @return: the cleaned (if necessary) path.
+  """

source/blender/python/api2_2x/doc/epy_docgen-3.sh

@@ -1,12 +0,0 @@
-# epy_docgen.sh
-# generates blender python doc using epydoc
-# requires epydoc in your PATH.
-# run from the doc directory containing the .py files
-# usage:  sh epy_docgen.sh
-
-# set posix locale so regex works properly for [A-Z]*.py
-LC_ALL=POSIX
-
-epydoc -v -o BPY_API --url "http://www.blender.org" --top API_intro \
- --name "Blender" --no-private --no-frames \
-$( ls [A-Z]*.py )

source/blender/python/api2_2x/doc/epy_docgen.sh

@@ -7,6 +7,5 @@
 # set posix locale so regex works properly for [A-Z]*.py
 LC_ALL=POSIX
 
-epydoc -o BPY_API --url "http://www.blender.org" -t API_intro.py \
- -n "Blender" --no-private --no-frames \
-$( ls [A-Z]*.py )
+epydoc -v  -o BPY_API --url "http://www.blender.org" --top API_intro \
+ --name "Blender" --no-private --no-frames [A-Z]*.py