[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34796] branches/particles-2010: svn merge -r34736:34795 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Lukas Toenne
lukas.toenne at googlemail.com
Sat Feb 12 13:53:35 CET 2011
Revision: 34796
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34796
Author: lukastoenne
Date: 2011-02-12 12:53:22 +0000 (Sat, 12 Feb 2011)
Log Message:
-----------
svn merge -r34736:34795 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34736
Modified Paths:
--------------
branches/particles-2010/build_files/package_spec/pacman/PKGBUILD
branches/particles-2010/extern/bullet2/CMakeLists.txt
branches/particles-2010/intern/guardedalloc/MEM_guardedalloc.h
branches/particles-2010/intern/smoke/intern/FLUID_3D.cpp
branches/particles-2010/release/scripts/io/netrender/ui.py
branches/particles-2010/release/scripts/keyingsets/keyingsets_builtins.py
branches/particles-2010/release/scripts/modules/bpy/utils.py
branches/particles-2010/release/scripts/modules/bpy_types.py
branches/particles-2010/release/scripts/op/add_mesh_torus.py
branches/particles-2010/release/scripts/op/animsys_update.py
branches/particles-2010/release/scripts/op/fcurve_euler_filter.py
branches/particles-2010/release/scripts/op/image.py
branches/particles-2010/release/scripts/op/mesh.py
branches/particles-2010/release/scripts/op/nla.py
branches/particles-2010/release/scripts/op/object.py
branches/particles-2010/release/scripts/op/object_align.py
branches/particles-2010/release/scripts/op/object_randomize_transform.py
branches/particles-2010/release/scripts/op/presets.py
branches/particles-2010/release/scripts/op/screen_play_rendered_anim.py
branches/particles-2010/release/scripts/op/sequencer.py
branches/particles-2010/release/scripts/op/uv.py
branches/particles-2010/release/scripts/op/uvcalc_follow_active.py
branches/particles-2010/release/scripts/op/uvcalc_smart_project.py
branches/particles-2010/release/scripts/op/vertexpaint_dirt.py
branches/particles-2010/release/scripts/op/wm.py
branches/particles-2010/release/scripts/templates/addon_add_object.py
branches/particles-2010/release/scripts/templates/builtin_keyingset.py
branches/particles-2010/release/scripts/templates/operator_export.py
branches/particles-2010/release/scripts/templates/operator_mesh_add.py
branches/particles-2010/release/scripts/templates/operator_modal.py
branches/particles-2010/release/scripts/templates/operator_modal_draw.py
branches/particles-2010/release/scripts/templates/operator_modal_view3d.py
branches/particles-2010/release/scripts/templates/operator_simple.py
branches/particles-2010/release/scripts/templates/operator_uv.py
branches/particles-2010/release/scripts/templates/panel_simple.py
branches/particles-2010/release/scripts/ui/properties_animviz.py
branches/particles-2010/release/scripts/ui/properties_data_armature.py
branches/particles-2010/release/scripts/ui/properties_data_bone.py
branches/particles-2010/release/scripts/ui/properties_data_camera.py
branches/particles-2010/release/scripts/ui/properties_data_curve.py
branches/particles-2010/release/scripts/ui/properties_data_empty.py
branches/particles-2010/release/scripts/ui/properties_data_lamp.py
branches/particles-2010/release/scripts/ui/properties_data_lattice.py
branches/particles-2010/release/scripts/ui/properties_data_mesh.py
branches/particles-2010/release/scripts/ui/properties_data_metaball.py
branches/particles-2010/release/scripts/ui/properties_data_modifier.py
branches/particles-2010/release/scripts/ui/properties_game.py
branches/particles-2010/release/scripts/ui/properties_material.py
branches/particles-2010/release/scripts/ui/properties_object.py
branches/particles-2010/release/scripts/ui/properties_object_constraint.py
branches/particles-2010/release/scripts/ui/properties_particle.py
branches/particles-2010/release/scripts/ui/properties_physics_cloth.py
branches/particles-2010/release/scripts/ui/properties_physics_common.py
branches/particles-2010/release/scripts/ui/properties_physics_field.py
branches/particles-2010/release/scripts/ui/properties_physics_fluid.py
branches/particles-2010/release/scripts/ui/properties_physics_smoke.py
branches/particles-2010/release/scripts/ui/properties_physics_softbody.py
branches/particles-2010/release/scripts/ui/properties_render.py
branches/particles-2010/release/scripts/ui/properties_scene.py
branches/particles-2010/release/scripts/ui/properties_texture.py
branches/particles-2010/release/scripts/ui/properties_world.py
branches/particles-2010/release/scripts/ui/space_console.py
branches/particles-2010/release/scripts/ui/space_dopesheet.py
branches/particles-2010/release/scripts/ui/space_filebrowser.py
branches/particles-2010/release/scripts/ui/space_graph.py
branches/particles-2010/release/scripts/ui/space_image.py
branches/particles-2010/release/scripts/ui/space_info.py
branches/particles-2010/release/scripts/ui/space_logic.py
branches/particles-2010/release/scripts/ui/space_nla.py
branches/particles-2010/release/scripts/ui/space_node.py
branches/particles-2010/release/scripts/ui/space_outliner.py
branches/particles-2010/release/scripts/ui/space_sequencer.py
branches/particles-2010/release/scripts/ui/space_text.py
branches/particles-2010/release/scripts/ui/space_time.py
branches/particles-2010/release/scripts/ui/space_userpref.py
branches/particles-2010/release/scripts/ui/space_userpref_keymap.py
branches/particles-2010/release/scripts/ui/space_view3d.py
branches/particles-2010/release/scripts/ui/space_view3d_toolbar.py
branches/particles-2010/source/blender/blenkernel/BKE_DerivedMesh.h
branches/particles-2010/source/blender/blenkernel/BKE_mesh.h
branches/particles-2010/source/blender/blenkernel/BKE_multires.h
branches/particles-2010/source/blender/blenkernel/BKE_node.h
branches/particles-2010/source/blender/blenkernel/intern/DerivedMesh.c
branches/particles-2010/source/blender/blenkernel/intern/customdata.c
branches/particles-2010/source/blender/blenkernel/intern/depsgraph.c
branches/particles-2010/source/blender/blenkernel/intern/image.c
branches/particles-2010/source/blender/blenkernel/intern/library.c
branches/particles-2010/source/blender/blenkernel/intern/material.c
branches/particles-2010/source/blender/blenkernel/intern/mesh.c
branches/particles-2010/source/blender/blenkernel/intern/mesh_validate.c
branches/particles-2010/source/blender/blenkernel/intern/multires.c
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/blenkernel/intern/particle.c
branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
branches/particles-2010/source/blender/blenkernel/intern/pointcache.c
branches/particles-2010/source/blender/blenkernel/intern/scene.c
branches/particles-2010/source/blender/blenkernel/intern/softbody.c
branches/particles-2010/source/blender/blenkernel/intern/texture.c
branches/particles-2010/source/blender/blenlib/BLI_boxpack2d.h
branches/particles-2010/source/blender/blenlib/BLI_storage.h
branches/particles-2010/source/blender/blenlib/BLI_string.h
branches/particles-2010/source/blender/blenlib/BLI_utildefines.h
branches/particles-2010/source/blender/blenlib/intern/boxpack2d.c
branches/particles-2010/source/blender/blenlib/intern/path_util.c
branches/particles-2010/source/blender/blenlib/intern/storage.c
branches/particles-2010/source/blender/blenlib/intern/string.c
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/collada/AnimationImporter.cpp
branches/particles-2010/source/blender/collada/ArmatureImporter.cpp
branches/particles-2010/source/blender/collada/CMakeLists.txt
branches/particles-2010/source/blender/collada/MeshImporter.cpp
branches/particles-2010/source/blender/collada/SkinInfo.cpp
branches/particles-2010/source/blender/collada/TransformReader.cpp
branches/particles-2010/source/blender/collada/collada.cpp
branches/particles-2010/source/blender/collada/collada_internal.cpp
branches/particles-2010/source/blender/collada/collada_utils.cpp
branches/particles-2010/source/blender/editors/animation/anim_channels_edit.c
branches/particles-2010/source/blender/editors/interface/interface_handlers.c
branches/particles-2010/source/blender/editors/interface/interface_icons.c
branches/particles-2010/source/blender/editors/mesh/editmesh.c
branches/particles-2010/source/blender/editors/mesh/mesh_data.c
branches/particles-2010/source/blender/editors/object/object_add.c
branches/particles-2010/source/blender/editors/object/object_edit.c
branches/particles-2010/source/blender/editors/object/object_relations.c
branches/particles-2010/source/blender/editors/object/object_transform.c
branches/particles-2010/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/particles-2010/source/blender/editors/space_buttons/buttons_header.c
branches/particles-2010/source/blender/editors/space_file/filelist.c
branches/particles-2010/source/blender/editors/space_logic/logic_window.c
branches/particles-2010/source/blender/editors/space_node/drawnode.c
branches/particles-2010/source/blender/editors/space_node/node_edit.c
branches/particles-2010/source/blender/editors/space_node/space_node.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_edit.c
branches/particles-2010/source/blender/gpu/intern/gpu_material.c
branches/particles-2010/source/blender/imbuf/IMB_thumbs.h
branches/particles-2010/source/blender/imbuf/intern/allocimbuf.c
branches/particles-2010/source/blender/makesdna/DNA_actuator_types.h
branches/particles-2010/source/blender/makesdna/DNA_modifier_types.h
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/makesdna/intern/makesdna.c
branches/particles-2010/source/blender/makesrna/intern/rna_actuator.c
branches/particles-2010/source/blender/makesrna/intern/rna_fluidsim.c
branches/particles-2010/source/blender/makesrna/intern/rna_mesh_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_modifier.c
branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
branches/particles-2010/source/blender/makesrna/intern/rna_space.c
branches/particles-2010/source/blender/modifiers/intern/MOD_mirror.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodetree.c
branches/particles-2010/source/blender/python/generic/mathutils.c
branches/particles-2010/source/blender/python/generic/mathutils_matrix.c
branches/particles-2010/source/blender/python/generic/mathutils_matrix.h
branches/particles-2010/source/blender/python/generic/mathutils_quat.c
branches/particles-2010/source/blender/python/generic/mathutils_vector.c
branches/particles-2010/source/blender/python/intern/bpy.c
branches/particles-2010/source/blender/python/intern/bpy_rna.c
branches/particles-2010/source/blender/python/intern/bpy_rna.h
branches/particles-2010/source/blender/render/intern/source/pipeline.c
branches/particles-2010/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/particles-2010/source/tests/CMakeLists.txt
Added Paths:
-----------
branches/particles-2010/build_files/package_spec/build_debian.sh
branches/particles-2010/build_files/package_spec/debian/
branches/particles-2010/build_files/package_spec/debian/changelog
branches/particles-2010/build_files/package_spec/debian/compat
branches/particles-2010/build_files/package_spec/debian/control
branches/particles-2010/build_files/package_spec/debian/copyright
branches/particles-2010/build_files/package_spec/debian/docs
branches/particles-2010/build_files/package_spec/debian/menu
branches/particles-2010/build_files/package_spec/debian/rules
branches/particles-2010/build_files/package_spec/debian/source/
branches/particles-2010/build_files/package_spec/debian/source/format
branches/particles-2010/build_files/package_spec/debian/watch
branches/particles-2010/release/scripts/modules/keyingsets_utils.py
Removed Paths:
-------------
branches/particles-2010/build_files/package_spec/debian/changelog
branches/particles-2010/build_files/package_spec/debian/compat
branches/particles-2010/build_files/package_spec/debian/control
branches/particles-2010/build_files/package_spec/debian/copyright
branches/particles-2010/build_files/package_spec/debian/docs
branches/particles-2010/build_files/package_spec/debian/menu
branches/particles-2010/build_files/package_spec/debian/rules
branches/particles-2010/build_files/package_spec/debian/source/
branches/particles-2010/build_files/package_spec/debian/source/format
branches/particles-2010/build_files/package_spec/debian/watch
branches/particles-2010/release/scripts/keyingsets/keyingsets_utils.py
Property Changed:
----------------
branches/particles-2010/
branches/particles-2010/build_files/package_spec/pacman/PKGBUILD
branches/particles-2010/build_files/package_spec/pacman/blender.install
Property changes on: branches/particles-2010
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:33741-34736
+ /trunk/blender:33741-34795
Copied: branches/particles-2010/build_files/package_spec/build_debian.sh (from rev 34795, trunk/blender/build_files/package_spec/build_debian.sh)
===================================================================
--- branches/particles-2010/build_files/package_spec/build_debian.sh (rev 0)
+++ branches/particles-2010/build_files/package_spec/build_debian.sh 2011-02-12 12:53:22 UTC (rev 34796)
@@ -0,0 +1,34 @@
+#!/bin/sh
+# Builds a debian package from SVN source.
+#
+# For paralelle builds use:
+# DEB_BUILD_OPTIONS="parallel=5" sh build_files/package_spec/build_debian.sh
+
+# this needs to run in the root dir.
+cd $(dirname $0)/../../
+rm -rf debian
+cp -a build_files/package_spec/debian .
+
+
+# Get values from blender to use in debian/changelog.
+BLENDER_REVISION=$(svnversion)
+
+blender_srcdir=$PWD
+blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
+BLENDER_VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100)
+DEB_VERSION=${BLENDER_VERSION}+svn${BLENDER_REVISION}-bf
+
+# update debian/changelog
+dch -b -v $DEB_VERSION "New upstream SVN snapshot."
+
+
+# run the rules makefile
+debian/rules get-orig-source SVN_URL=.
+mv *.gz ../
+
+# build the package
+debuild -i -us -uc -b
+
+
+# remove temp dir
+rm -rf debian
Deleted: branches/particles-2010/build_files/package_spec/debian/changelog
===================================================================
--- trunk/blender/build_files/package_spec/debian/changelog 2011-02-12 11:50:14 UTC (rev 34795)
+++ branches/particles-2010/build_files/package_spec/debian/changelog 2011-02-12 12:53:22 UTC (rev 34796)
@@ -1,5 +0,0 @@
-blender (2.56+svn34749-bf) unstable; urgency=low
-
- * New upstream SVN snapshot.
-
- -- Dan Eicher <dan at trollwerks.org> Wed, 09 Feb 2011 18:55:24 -0700
Copied: branches/particles-2010/build_files/package_spec/debian/changelog (from rev 34795, trunk/blender/build_files/package_spec/debian/changelog)
===================================================================
--- branches/particles-2010/build_files/package_spec/debian/changelog (rev 0)
+++ branches/particles-2010/build_files/package_spec/debian/changelog 2011-02-12 12:53:22 UTC (rev 34796)
@@ -0,0 +1,5 @@
+blender (2.56+svn34749-bf) unstable; urgency=low
+
+ * New upstream SVN snapshot.
+
+ -- Dan Eicher <dan at trollwerks.org> Wed, 09 Feb 2011 18:55:24 -0700
Deleted: branches/particles-2010/build_files/package_spec/debian/compat
===================================================================
--- trunk/blender/build_files/package_spec/debian/compat 2011-02-12 11:50:14 UTC (rev 34795)
+++ branches/particles-2010/build_files/package_spec/debian/compat 2011-02-12 12:53:22 UTC (rev 34796)
@@ -1 +0,0 @@
-7
Copied: branches/particles-2010/build_files/package_spec/debian/compat (from rev 34795, trunk/blender/build_files/package_spec/debian/compat)
===================================================================
--- branches/particles-2010/build_files/package_spec/debian/compat (rev 0)
+++ branches/particles-2010/build_files/package_spec/debian/compat 2011-02-12 12:53:22 UTC (rev 34796)
@@ -0,0 +1 @@
+7
Deleted: branches/particles-2010/build_files/package_spec/debian/control
===================================================================
--- trunk/blender/build_files/package_spec/debian/control 2011-02-12 11:50:14 UTC (rev 34795)
+++ branches/particles-2010/build_files/package_spec/debian/control 2011-02-12 12:53:22 UTC (rev 34796)
@@ -1,23 +0,0 @@
-Source: blender
-Section: graphics
-Priority: extra
-Maintainer: Dan Eicher <dan at trollwerks.org>
-Build-Depends: debhelper (>= 7.0.50~), cmake, python3, python, libfreetype6-dev, libglu1-mesa-dev, libilmbase-dev, libopenexr-dev, libjpeg62-dev, libopenal-dev, libpng12-dev, libsamplerate0-dev, libsdl-dev, libtiff4-dev, libx11-dev, libxi-dev, zlib1g-dev, python3.1-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386]
-Standards-Version: 3.9.1
-Homepage: http://blender.org/
-Vcs-Browser: http://github.com/eponymous/blender
-Vcs-Git: git://github.com/eponymous/blender.git
-X-Python3-Version: >= 3.1, << 3.2
-
-Package: blender
-Architecture: any
-Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}
-Description: Very fast and versatile 3D modeller/renderer
- Blender is an integrated 3d suite for modelling, animation, rendering,
- post-production, interactive creation and playback (games). Blender has its
- own particular user interface, which is implemented entirely in OpenGL and
- designed with speed in mind. Python bindings are available for scripting;
- import/export features for popular file formats like 3D Studio and Wavefront
- Obj are implemented as scripts by the community. Stills, animations, models
- for games or other third party engines and interactive content in the form of
- a standalone binary and/or a web plug-in are common products of Blender use.
Copied: branches/particles-2010/build_files/package_spec/debian/control (from rev 34795, trunk/blender/build_files/package_spec/debian/control)
===================================================================
--- branches/particles-2010/build_files/package_spec/debian/control (rev 0)
+++ branches/particles-2010/build_files/package_spec/debian/control 2011-02-12 12:53:22 UTC (rev 34796)
@@ -0,0 +1,23 @@
+Source: blender
+Section: graphics
+Priority: extra
+Maintainer: Dan Eicher <dan at trollwerks.org>
+Build-Depends: debhelper (>= 7.0.50~), cmake, python3, python, libfreetype6-dev, libglu1-mesa-dev, libilmbase-dev, libopenexr-dev, libjpeg62-dev, libopenal-dev, libpng12-dev, libsamplerate0-dev, libsdl-dev, libtiff4-dev, libx11-dev, libxi-dev, zlib1g-dev, python3.1-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386]
+Standards-Version: 3.9.1
+Homepage: http://blender.org/
+Vcs-Browser: http://github.com/eponymous/blender
+Vcs-Git: git://github.com/eponymous/blender.git
+X-Python3-Version: >= 3.1, << 3.2
+
+Package: blender
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}
+Description: Very fast and versatile 3D modeller/renderer
+ Blender is an integrated 3d suite for modelling, animation, rendering,
+ post-production, interactive creation and playback (games). Blender has its
+ own particular user interface, which is implemented entirely in OpenGL and
+ designed with speed in mind. Python bindings are available for scripting;
+ import/export features for popular file formats like 3D Studio and Wavefront
+ Obj are implemented as scripts by the community. Stills, animations, models
+ for games or other third party engines and interactive content in the form of
+ a standalone binary and/or a web plug-in are common products of Blender use.
Deleted: branches/particles-2010/build_files/package_spec/debian/copyright
===================================================================
--- trunk/blender/build_files/package_spec/debian/copyright 2011-02-12 11:50:14 UTC (rev 34795)
+++ branches/particles-2010/build_files/package_spec/debian/copyright 2011-02-12 12:53:22 UTC (rev 34796)
@@ -1,92 +0,0 @@
-This work was packaged for Debian by:
-
- Dan Eicher <dan at trollwerks.org> on Tue, 08 Feb 2011 21:59:32 -0700
-
-It was downloaded from:
-
- http://blender.org
-
-Copyright:
-
- Copyright (C) 2002-2011 Blender Foundation
-
-License:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
-
-On Debian systems, the complete text of the GNU General
-Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-Python:
-
- PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- --------------------------------------------
-
- 1. This LICENSE AGREEMENT is between the Python Software Foundation
- ("PSF"), and the Individual or Organization ("Licensee") accessing and
- otherwise using this software ("Python") in source or binary form and
- its associated documentation.
-
- 2. Subject to the terms and conditions of this License Agreement, PSF
- hereby grants Licensee a nonexclusive, royalty-free, world-wide
- license to reproduce, analyze, test, perform and/or display publicly,
- prepare derivative works, distribute, and otherwise use Python
- alone or in any derivative version, provided, however, that PSF's
- License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
- 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
- Reserved" are retained in Python alone or in any derivative version
- prepared by Licensee.
-
- 3. In the event Licensee prepares a derivative work that is based on
- or incorporates Python or any part thereof, and wants to make
- the derivative work available to others as provided herein, then
- Licensee hereby agrees to include in any such work a brief summary of
- the changes made to Python.
-
- 4. PSF is making Python available to Licensee on an "AS IS"
- basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
-
- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
- FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
- A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
- OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
- 6. This License Agreement will automatically terminate upon a material
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list