[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44070] branches/soc-2011-tomato: Merging r44003 through r44069 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Sun Feb 12 20:00:13 CET 2012
Revision: 44070
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44070
Author: nazgul
Date: 2012-02-12 19:00:13 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Merging r44003 through r44069 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44003
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44069
Modified Paths:
--------------
branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.sh
branches/soc-2011-tomato/extern/CMakeLists.txt
branches/soc-2011-tomato/extern/binreloc/CMakeLists.txt
branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt
branches/soc-2011-tomato/extern/carve/CMakeLists.txt
branches/soc-2011-tomato/extern/colamd/CMakeLists.txt
branches/soc-2011-tomato/extern/eltopo/CMakeLists.txt
branches/soc-2011-tomato/extern/glew/CMakeLists.txt
branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
branches/soc-2011-tomato/extern/libopenjpeg/CMakeLists.txt
branches/soc-2011-tomato/extern/libredcode/CMakeLists.txt
branches/soc-2011-tomato/extern/lzma/CMakeLists.txt
branches/soc-2011-tomato/extern/lzo/CMakeLists.txt
branches/soc-2011-tomato/extern/recastnavigation/CMakeLists.txt
branches/soc-2011-tomato/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2011-tomato/source/blender/blenfont/BLF_api.h
branches/soc-2011-tomato/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_booleanops_mesh.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_callbacks.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_graph.h
branches/soc-2011-tomato/source/blender/collada/TransformWriter.cpp
branches/soc-2011-tomato/source/blender/editors/interface/resources.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-tomato/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_FontObject.cpp
branches/soc-2011-tomato/source/tests/bl_pyapi_mathutils.py
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-44002
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-44069
Modified: branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py 2012-02-12 18:57:05 UTC (rev 44069)
+++ branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py 2012-02-12 19:00:13 UTC (rev 44070)
@@ -1135,8 +1135,10 @@
fw("\n")
fw("Welcome, this document is an API reference for Blender %s. built %s.\n" % (version_string, bpy.app.build_date))
fw("\n")
- fw("`A PDF version of this document is also available <blender_python_reference_%s.pdf>`_\n" % version_string_pdf)
+ # fw("`A PDF version of this document is also available <blender_python_reference_%s.pdf>`_\n" % version_string_pdf)
+ fw("`A compressed ZIP file of this site is available <blender_python_reference_%s.zip>`_\n" % version_string_pdf)
+
fw("\n")
if not EXCLUDE_INFO_DOCS:
Modified: branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.sh
===================================================================
--- branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.sh 2012-02-12 18:57:05 UTC (rev 44069)
+++ branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.sh 2012-02-12 19:00:13 UTC (rev 44070)
@@ -11,7 +11,8 @@
DO_UPLOAD=true
DO_EXE_BLENDER=true
DO_OUT_HTML=true
-DO_OUT_PDF=true
+DO_OUT_HTML_ZIP=true
+DO_OUT_PDF=false
BLENDER="./blender.bin"
@@ -61,6 +62,17 @@
# annoying bug in sphinx makes it very slow unless we do this. should report.
cd $SPHINXBASE
sphinx-build -n -b html sphinx-in sphinx-out
+
+ # ------------------------------------------------------------------------
+ # ZIP the HTML dir for upload
+
+ if $DO_OUT_HTML_ZIP ; then
+ # lame, temp rename dir
+ mv sphinx-out blender_python_reference_$BLENDER_VERSION
+ zip -r -9 blender_python_reference_$BLENDER_VERSION.zip blender_python_reference_$BLENDER_VERSION
+ mv blender_python_reference_$BLENDER_VERSION sphinx-out
+ fi
+
cd -
fi
@@ -74,6 +86,7 @@
mv $SPHINXBASE/sphinx-out/contents.pdf $SPHINXBASE/sphinx-out/blender_python_reference_$BLENDER_VERSION.pdf
fi
+
# ----------------------------------------------------------------------------
# Upload to blender servers, comment this section for testing
@@ -89,9 +102,15 @@
# better redirect
ssh $SSH_USER at emo.blender.org 'echo "<html><head><title>Redirecting...</title><meta http-equiv=\"REFRESH\" content=\"0;url=../blender_python_api_'$BLENDER_VERSION'/\"></head><body>Redirecting...</body></html>" > '$SSH_UPLOAD'/250PythonDoc/index.html'
- # rename so local PDF has matching name.
- 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
+ if $DO_OUT_PDF ; then
+ # rename so local PDF has matching name.
+ 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
+ fi
+ if $DO_OUT_HTML_ZIP ; then
+ rsync --progress -avze "ssh -p 22" $SPHINXBASE/blender_python_reference_$BLENDER_VERSION.zip $SSH_HOST:$SSH_UPLOAD_FULL/blender_python_reference_$BLENDER_VERSION.zip
+ fi
+
fi
Modified: branches/soc-2011-tomato/extern/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/CMakeLists.txt 2012-02-12 18:57:05 UTC (rev 44069)
+++ branches/soc-2011-tomato/extern/CMakeLists.txt 2012-02-12 19:00:13 UTC (rev 44070)
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2006, Blender Foundation
# All rights reserved.
Modified: branches/soc-2011-tomato/extern/binreloc/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/binreloc/CMakeLists.txt 2012-02-12 18:57:05 UTC (rev 44069)
+++ branches/soc-2011-tomato/extern/binreloc/CMakeLists.txt 2012-02-12 19:00:13 UTC (rev 44070)
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2008 by The Blender Foundation
# All rights reserved.
Modified: branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt 2012-02-12 18:57:05 UTC (rev 44069)
+++ branches/soc-2011-tomato/extern/bullet2/CMakeLists.txt 2012-02-12 19:00:13 UTC (rev 44070)
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2006, Blender Foundation
# All rights reserved.
Modified: branches/soc-2011-tomato/extern/carve/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/carve/CMakeLists.txt 2012-02-12 18:57:05 UTC (rev 44069)
+++ branches/soc-2011-tomato/extern/carve/CMakeLists.txt 2012-02-12 19:00:13 UTC (rev 44070)
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2006, Blender Foundation
# All rights reserved.
Modified: branches/soc-2011-tomato/extern/colamd/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/colamd/CMakeLists.txt 2012-02-12 18:57:05 UTC (rev 44069)
+++ branches/soc-2011-tomato/extern/colamd/CMakeLists.txt 2012-02-12 19:00:13 UTC (rev 44070)
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2011, Blender Foundation
# All rights reserved.
Modified: branches/soc-2011-tomato/extern/eltopo/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/eltopo/CMakeLists.txt 2012-02-12 18:57:05 UTC (rev 44069)
+++ branches/soc-2011-tomato/extern/eltopo/CMakeLists.txt 2012-02-12 19:00:13 UTC (rev 44070)
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2006, Blender Foundation
# All rights reserved.
Modified: branches/soc-2011-tomato/extern/glew/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/glew/CMakeLists.txt 2012-02-12 18:57:05 UTC (rev 44069)
+++ branches/soc-2011-tomato/extern/glew/CMakeLists.txt 2012-02-12 19:00:13 UTC (rev 44070)
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2006, Blender Foundation
# All rights reserved.
Modified: branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/libmv/CMakeLists.txt 2012-02-12 18:57:05 UTC (rev 44069)
+++ branches/soc-2011-tomato/extern/libmv/CMakeLists.txt 2012-02-12 19:00:13 UTC (rev 44070)
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2011, Blender Foundation
# All rights reserved.
Modified: branches/soc-2011-tomato/extern/libopenjpeg/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/libopenjpeg/CMakeLists.txt 2012-02-12 18:57:05 UTC (rev 44069)
+++ branches/soc-2011-tomato/extern/libopenjpeg/CMakeLists.txt 2012-02-12 19:00:13 UTC (rev 44070)
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# The Original Code is Copyright (C) 2006, Blender Foundation
# All rights reserved.
Modified: branches/soc-2011-tomato/extern/libredcode/CMakeLists.txt
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list