- cmake was missing an inclide (IDE's wouldnt index)

- made doc generation always sumlink newly built docs to static URL. http://www.blender.org/documentation/250PythonDoc/

5 files changed, 15 insertions, 7 deletions

diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index 3d220434e94..22655498a63 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -328,7 +328,7 @@ def rna2sphinx(BASEPATH):
     file = open(filepath, "w")
     fw = file.write
 
-    version_string = bpy.app.version_string.split("(")[0]
+    version_string = ".".join(str(v) for v in bpy.app.version)
     if bpy.app.build_revision != "Unknown":
         version_string = version_string + " r" + bpy.app.build_revision
 
diff --git a/doc/python_api/sphinx_doc_gen.sh b/doc/python_api/sphinx_doc_gen.sh
index 90116b43414..c027db83831 100755
--- a/doc/python_api/sphinx_doc_gen.sh
+++ b/doc/python_api/sphinx_doc_gen.sh
@@ -4,10 +4,11 @@
 # ssh upload means you need an account on the server
 
 BLENDER="./blender.bin"
-SSH_HOST="ideasman42@emo.blender.org"
+SSH_USER="ideasman42"
+SSH_HOST=$SSH_USER"@emo.blender.org"
 SSH_UPLOAD="/data/www/vhosts/www.blender.org/documentation" # blender_python_api_VERSION, added after
 
-# sed string from hell, 'Blender 2.53 (sub 1) Build' --> '2_53_1'
+# 'Blender 2.53 (sub 1) Build' --> '2_53_1' as a shell script.
 # "_".join(str(v) for v in bpy.app.version)
 # custom blender vars
 blender_srcdir=$(dirname $0)/../../
@@ -25,12 +26,18 @@ $BLENDER --background --factory-startup --python $SPHINXBASE/sphinx_doc_gen.py
 # html
 sphinx-build $SPHINXBASE/sphinx-in $SPHINXBASE/sphinx-out
 cp $SPHINXBASE/sphinx-out/contents.html $SPHINXBASE/sphinx-out/index.html
-ssh ideasman42@emo.blender.org 'rm -rf '$SSH_UPLOAD_FULL'/*'
+ssh $SSH_USER@emo.blender.org 'rm -rf '$SSH_UPLOAD_FULL'/*'
 rsync --progress -avze "ssh -p 22" $SPHINXBASE/sphinx-out/* $SSH_HOST:$SSH_UPLOAD_FULL/
 
+# symlink the dir to a static URL
+ssh $SSH_USER@emo.blender.org 'rm '$SSH_UPLOAD'/250PythonDoc && ln -s '$SSH_UPLOAD_FULL' '$SSH_UPLOAD'/250PythonDoc'
+
 # pdf
 sphinx-build -b latex $SPHINXBASE/sphinx-in $SPHINXBASE/sphinx-out
 cd $SPHINXBASE/sphinx-out
 make
 cd -
-rsync --progress -avze "ssh -p 22" $SPHINXBASE/sphinx-out/contents.pdf $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.pdf
+
+# rename so local PDF has matching name.
+mv $SPHINXBASE/sphinx-out/contents.pdf $SPHINXBASE/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf
+rsync --progress -avze "ssh -p 22" $SPHINXBASE/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.pdf
diff --git a/source/blender/python/generic/mathutils_euler.c b/source/blender/python/generic/mathutils_euler.c
index 509388de8cb..8792b154ca6 100644
--- a/source/blender/python/generic/mathutils_euler.c
+++ b/source/blender/python/generic/mathutils_euler.c
@@ -122,7 +122,7 @@ static PyObject *Euler_ToTupleExt(EulerObject *self, int ndigits)
 //return a quaternion representation of the euler
 
 static char Euler_to_quaternion_doc[] =
-".. method:: to_quat()\n"
+".. method:: to_quaternion()\n"
 "\n"
 "   Return a quaternion representation of the euler.\n"
 "\n"
diff --git a/source/blender/python/generic/mathutils_matrix.c b/source/blender/python/generic/mathutils_matrix.c
index 2837c5223a1..69a3a9d63fa 100644
--- a/source/blender/python/generic/mathutils_matrix.c
+++ b/source/blender/python/generic/mathutils_matrix.c
@@ -635,7 +635,7 @@ static float matrix_determinant_internal(MatrixObject *self)
 
 /*-----------------------------METHODS----------------------------*/
 static char Matrix_to_quaternion_doc[] =
-".. method:: to_quat()\n"
+".. method:: to_quaternion()\n"
 "\n"
 "   Return a quaternion representation of the rotation matrix.\n"
 "\n"
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index ee99e3af3b9..4a3a73e7467 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -107,6 +107,7 @@ set(SRC
 	intern/include/zbuf.h
 	intern/raytrace/bvh.h
 	intern/raytrace/rayobject_hint.h
+	intern/raytrace/rayobject_internal.h
 	intern/raytrace/rayobject_rtbuild.h
 	intern/raytrace/reorganize.h
 	intern/raytrace/svbvh.h