[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39884] branches/bmesh/blender: svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Campbell Barton
ideasman42 at gmail.com
Sat Sep 3 04:49:25 CEST 2011
Revision: 39884
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39884
Author: campbellbarton
Date: 2011-09-03 02:49:21 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39831
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/doc/python_api/rst/bge.types.rst
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/source/blender/blenkernel/intern/collision.c
branches/bmesh/blender/source/blender/blenkernel/intern/nla.c
branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
branches/bmesh/blender/source/blender/blenlib/intern/math_geom.c
branches/bmesh/blender/source/blender/editors/animation/anim_filter.c
branches/bmesh/blender/source/blender/editors/animation/keyframing.c
branches/bmesh/blender/source/blender/editors/object/object_bake.c
branches/bmesh/blender/source/blender/editors/sound/sound_ops.c
branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_draw.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_edit.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_intern.h
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_tools.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_tree.c
branches/bmesh/blender/source/blender/editors/space_text/space_text.c
branches/bmesh/blender/source/blender/editors/space_text/text_draw.c
branches/bmesh/blender/source/blender/editors/space_text/text_intern.h
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
branches/bmesh/blender/source/blender/imbuf/intern/anim_movie.c
branches/bmesh/blender/source/blender/imbuf/intern/indexer_dv.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_wm.c
branches/bmesh/blender/source/blender/python/generic/bgl.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
branches/bmesh/blender/source/blender/render/intern/source/zbuf.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/gameengine/Converter/BL_ActionActuator.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_ActionActuator.h
branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/bmesh/blender/source/gameengine/Converter/BlenderWorldInfo.cpp
branches/bmesh/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/bmesh/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/bmesh/blender/source/gameengine/Expressions/InputParser.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_RandomSensor.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SCA_XORController.cpp
branches/bmesh/blender/source/gameengine/GamePlayer/common/bmfont.cpp
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/bmesh/blender/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_Camera.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_Dome.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_Light.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/bmesh/blender/source/gameengine/SceneGraph/SG_BBox.cpp
branches/bmesh/blender/source/gameengine/SceneGraph/SG_Spatial.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/Exception.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/ImageBase.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/ImageRender.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/ImageViewport.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/bmesh/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
branches/bmesh/blender/source/tests/check_deprecated.py
Added Paths:
-----------
branches/bmesh/blender/doc/python_api/rst/info_tips_and_tricks.rst
branches/bmesh/blender/intern/tools/credits_svn_gen.py
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/editors/render/render_update.c
branches/bmesh/blender/source/blender/editors/space_outliner/
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:31524-39831
+ /trunk/blender:31524-39877
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-09-03 02:15:49 UTC (rev 39883)
+++ branches/bmesh/blender/CMakeLists.txt 2011-09-03 02:49:21 UTC (rev 39884)
@@ -948,7 +948,7 @@
# we use precompiled libraries for py 3.2 and up by default
# normally cached but not since we include them with blender
- set(PYTHON_VERSION 3.2)
+ set(PYTHON_VERSION 3.2)
set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
# set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
set(PYTHON_LIBRARY python${PYTHON_VERSION})
Modified: branches/bmesh/blender/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/bge.types.rst 2011-09-03 02:15:49 UTC (rev 39883)
+++ branches/bmesh/blender/doc/python_api/rst/bge.types.rst 2011-09-03 02:49:21 UTC (rev 39884)
@@ -1539,7 +1539,7 @@
Return the value matching key, or the default value if its not found.
:return: The key value or a default.
- .. method:: playAction(name, start_frame, end_frame, layer=0, priority=0 blendin=0, play_mode=ACT_MODE_PLAY, layer_weight=0.0, ipo_flags=0, speed=1.0)
+ .. method:: playAction(name, start_frame, end_frame, layer=0, priority=0, blendin=0, play_mode=ACT_MODE_PLAY, layer_weight=0.0, ipo_flags=0, speed=1.0)
Plays an action.
Copied: branches/bmesh/blender/doc/python_api/rst/info_tips_and_tricks.rst (from rev 39877, trunk/blender/doc/python_api/rst/info_tips_and_tricks.rst)
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/info_tips_and_tricks.rst (rev 0)
+++ branches/bmesh/blender/doc/python_api/rst/info_tips_and_tricks.rst 2011-09-03 02:49:21 UTC (rev 39884)
@@ -0,0 +1,57 @@
+###############
+Tips and Tricks
+###############
+
+Some of these are just python features that scripters may not have thaught to use with blender.
+
+
+****************
+Use The Terminal
+****************
+
+For Linux and OSX users this means starting the terminal first, then running blender from within it. on Windows the terminal can be enabled from the help menu.
+
+********************
+Run External Scripts
+********************
+
+
+******************
+Don't Use Blender!
+******************
+
+
+******************
+Use External Tools
+******************
+
+
+**************
+Bundled Python
+**************
+
+Blender from blender.org includes a compleate python installation on all platforms, this has the disadvantage that any extensions you have installed in you're systems python wont be found by blender.
+
+There are 2 ways around this:
+
+* remove blender python subdirectory, blender will then look for the systems python and use that instead **python version must match the one that blender comes with**.
+
+* copy the extensions into blender's python subdirectry so blender can access them, you could also copy the entire python installation into blenders subdirectory, replacing the one blender comes with. This works as long as the python versions match and the paths are created in the same location relative locations. Doing this has the advantage that you can redistribute this bundle to others with blender and/or the game player, including any extensions you rely on.
+
+********
+Advanced
+********
+
+
+===================
+Blender as a module
+===================
+
+
+============================
+Python Safety (Build Option)
+============================
+
+=================
+CTypes in Blender
+=================
Copied: branches/bmesh/blender/intern/tools/credits_svn_gen.py (from rev 39877, trunk/blender/intern/tools/credits_svn_gen.py)
===================================================================
--- branches/bmesh/blender/intern/tools/credits_svn_gen.py (rev 0)
+++ branches/bmesh/blender/intern/tools/credits_svn_gen.py 2011-09-03 02:49:21 UTC (rev 39884)
@@ -0,0 +1,472 @@
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+# This program 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 program 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, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+
+"""
+This script generates a credits list for:
+
+ http://www.blender.org/development/credits
+
+
+To use this script you'll need to set 2 variables (below)
+
+eg:
+
+ svn_log = "somelog.xml"
+ tracker_csv = "tracker_report-2011-09-02.csv"
+
+
+The first is the result of running this:
+
+ svn log https://svn.blender.org/svnroot/bf-blender/trunk/blender -v --xml
+
+The csv file must be saved from the tracker, be sure to select all patches
+not just open ones.
+
+
+Running this script will create a file called 'credits.html',
+the resulting data is then be copied into the Development/Credits page
+in blender.org's typo3.
+"""
+
+# -----------------------------------------------------------------------------
+# Generic Class and parsing code, could be useful for all sorts of cases
+
+class SvnCommit(object):
+ """Just data store really"""
+ __slots__ = ("revision",
+ "author",
+ "date",
+ "message",
+ "paths",
+ )
+
+ def __init__(self, xml):
+ self.revision = int(xml.attributes["revision"].nodeValue)
+
+ elems = xml.getElementsByTagName("author")
+ self.author = elems[0].firstChild.nodeValue
+
+ elems = xml.getElementsByTagName("date")
+ self.date = elems[0].firstChild.nodeValue
+
+ # treat the message
+ # possible there is no message
+ elems = xml.getElementsByTagName("msg")
+ message = getattr(elems[0].firstChild, "nodeValue", "")
+ message = " ".join(message.split())
+ self.message = message
+
+ # for now we ignore: elem.attributes["kind"]
+ self.paths = [(elem.attributes["action"].value,
+ elem.firstChild.nodeValue,
+ )
+ for elem in xml.getElementsByTagName("path")]
+
+ def __repr__(self):
+ repr_dict = {}
+ for attr in self.__slots__:
+ repr_dict[attr] = getattr(self, attr)
+ return repr(repr_dict)
+
+
+def parse_commits(filepath):
+ import xml.dom.minidom
+ from xml.dom.minidom import parse
+
+ svn_xml = parse(filepath)
+ # almost certainly only 1 but, just incase
+
+ commits = []
+
+ for log_list in svn_xml.getElementsByTagName("log"):
+ log_entries = log_list.getElementsByTagName("logentry")
+ for commit_xml in log_entries:
+
+ # get all data from the commit into a dict for more easy checking.
+ commits.append(SvnCommit(commit_xml))
+
+ return commits
+
+
+# -----------------------------------------------------------------------------
+# Special checks to extract the credits
+
+#svn_log = "/dsk/data/src/blender/svn_log_verbose.xml"
+svn_log = "/dsk/data/src/blender/svn_log_verbose.xml"
+tracker_csv = "/l/tracker_report-2011-09-02.csv"
+
+# TODO, there are for sure more companies then are currently listed.
+# 1 liners for in wiki syntax
+contrib_companies = [
+ "<b>Unity Technologies</b> - FBX Exporter",
+ "<b>BioSkill GmbH</b> - H3D compatibility for X3D Exporter, "
+ "OBJ Nurbs Import/Export",
+]
+
+# ignore commits containing these messages
+ignore_msg = (
+ "SVN maintenance",
+ )
+
+# ignore these paths
+# implicitly ignore anything _not_ in /trunk/blender
+ignore_dir = (
+ "/trunk/blender/extern/",
+ "/trunk/blender/scons/",
+ "/trunk/blender/intern/opennl/",
+ "/trunk/blender/intern/moto/",
+ )
+
+ignore_revisions = {2, # initial commit by Hans
+ }
+
+# important, second value _must_ be the name used by projects.blender.org
+# anyone who ever committed to blender
+author_name_mapping = {
+ "alexk": "Alexander Kuznetsov",
+ "aligorith": "Joshua Leung",
+ "antont": "Toni Alatalo",
+ "aphex": "Simon Clitherow",
+ "artificer": "Ben Batt",
+ "ascotan": "Joseph Gilbert",
+ "bdiego": "Diego Borghetti",
+ "bebraw": "Juho Vepsalainen",
+ "ben2610": "Benoit Bolsee",
+ "billrey": "William Reynish",
+ "bjornmose": "Jens Ole Wund",
+ "blendix": "Brecht Van Lommel",
+ "briggs": "Geoffrey Bantle",
+ "broken": "Matt Ebb",
+ "campbellbarton": "Campbell Barton",
+ "cessen": "Nathan Vegdahl",
+ "damien78": "Damien Plisson",
+ "desoto": "Chris Burt",
+ "dfelinto": "Dalai Felinto",
+ "dingto": "Thomas Dinges",
+ "djcapelis": "D.J. Capelis",
+ "dougal2": "Doug Hammond",
+ "elubie": "Andrea Weikert",
+ "erwin": "Erwin Coumans",
+ "genscher": "Daniel Genrich",
+ "goofster": "Roel Spruit",
+ "gsrb3d": "gsr b3d",
+ "guitargeek": "Johnny Matthews",
+ "hans": "Hans Lambermont",
+ "harkyman": "Roland Hess",
+ "hos": "Chris Want",
+ "ianwill": "Willian Padovani Germano",
+ "imbusy": "Lukas Steiblys",
+ "intrr": "Alexander Ewering",
+ "jbakker": "Jeroen Bakker",
+ "jensverwiebe": "Jens Verwiebe",
+ "jesterking": "Nathan Letwory",
+ "jhk": "Janne Karhu",
+ "jiri": "Jiri Hnidek",
+ "joeedh": "Joseph Eagar",
+ "jwilkins": "Jason Wilkins",
+ "kazanbas": "Arystanbek Dyussenov",
+ "kester": "Kester Maddock",
+ "khughes": "Ken Hughes",
+ "kwk": "Konrad Kleine",
+ "letterrip": "Tom Musgrove",
+ "lmg": "M.G. Kishalmi",
+ "lukastoenne": "Lukas Toenne",
+ "lukep": "Jean-Luc Peurière",
+ "lusque": "Ervin Weber",
+ "mal_cando": "Mal Duffin",
+ "merwin": "Mike Erwin",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list