Merged changes in the trunk up to revision 32886.

This commit is contained in:
Tamito Kajiyama
2010-11-05 21:49:36 +00:00
552 changed files with 14432 additions and 21005 deletions

View File

@@ -371,7 +371,7 @@ def rna2sphinx(BASEPATH):
fw(" These parts of the API are relatively stable and are unlikely to change significantly\n")
fw(" * data API, access to attributes of blender data such as mesh verts, material color, timeline frames and scene objects\n")
fw(" * user interface functions for defining buttons, creation of menus, headers, panels\n")
fw(" * modules: bgl, mathutils and geometry\n")
fw(" * modules: bgl and mathutils\n")
fw(" * game engine modules\n")
fw("\n")

View File

@@ -15,7 +15,6 @@ blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel
blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
BLENDER_VERSION=$(expr $blender_version / 100)_$(expr $blender_version % 100)_$blender_subversion
BLENDER_VERSION=`$BLENDER --version | cut -f2-4 -d" " | sed 's/(//g' | sed 's/)//g' | sed 's/ sub /./g' | sed 's/\./_/g'`
SSH_UPLOAD_FULL=$SSH_UPLOAD/"blender_python_api_"$BLENDER_VERSION
SPHINXBASE=doc/python_api/