[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39932] branches/vgroup_modifiers: Merging r39847 through r39930 from trunk into vgroup_modifiers.
Bastien Montagne
montagne29 at wanadoo.fr
Mon Sep 5 18:27:26 CEST 2011
Revision: 39932
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39932
Author: mont29
Date: 2011-09-05 16:27:25 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
Merging r39847 through r39930 from trunk into vgroup_modifiers.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39847
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39930
Modified Paths:
--------------
branches/vgroup_modifiers/doc/python_api/rst/bge.types.rst
branches/vgroup_modifiers/intern/guardedalloc/MEM_sys_types.h
branches/vgroup_modifiers/intern/iksolver/intern/IK_QSegment.cpp
branches/vgroup_modifiers/intern/opennl/superlu/superlu_sys_types.h
branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh_validate.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/nla.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/sound.c
branches/vgroup_modifiers/source/blender/blenloader/BLO_sys_types.h
branches/vgroup_modifiers/source/blender/collada/AnimationExporter.cpp
branches/vgroup_modifiers/source/blender/collada/AnimationImporter.cpp
branches/vgroup_modifiers/source/blender/collada/AnimationImporter.h
branches/vgroup_modifiers/source/blender/collada/ArmatureExporter.cpp
branches/vgroup_modifiers/source/blender/collada/ArmatureImporter.cpp
branches/vgroup_modifiers/source/blender/collada/ArmatureImporter.h
branches/vgroup_modifiers/source/blender/collada/DocumentExporter.cpp
branches/vgroup_modifiers/source/blender/collada/DocumentImporter.cpp
branches/vgroup_modifiers/source/blender/collada/ExtraTags.cpp
branches/vgroup_modifiers/source/blender/collada/MeshImporter.cpp
branches/vgroup_modifiers/source/blender/collada/SkinInfo.cpp
branches/vgroup_modifiers/source/blender/collada/TransformWriter.cpp
branches/vgroup_modifiers/source/blender/editors/animation/anim_filter.c
branches/vgroup_modifiers/source/blender/editors/animation/keyframing.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_draw.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh.c
branches/vgroup_modifiers/source/blender/editors/object/object_edit.c
branches/vgroup_modifiers/source/blender/editors/object/object_modifier.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_draw.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_edit.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_intern.h
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_tools.c
branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_tree.c
branches/vgroup_modifiers/source/blender/editors/space_text/space_text.c
branches/vgroup_modifiers/source/blender/editors/space_text/text_draw.c
branches/vgroup_modifiers/source/blender/editors/space_text/text_intern.h
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_access.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_fluidsim.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_nodetree.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_object.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene_api.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_space.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_wm.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_screw.c
branches/vgroup_modifiers/source/blender/python/generic/py_capi_utils.c
branches/vgroup_modifiers/source/blender/python/intern/bpy_driver.c
branches/vgroup_modifiers/source/blender/python/intern/bpy_rna.c
branches/vgroup_modifiers/source/blender/render/intern/source/shadeoutput.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_event_system.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_operators.c
branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/vgroup_modifiers/source/gameengine/Converter/BL_ActionActuator.cpp
branches/vgroup_modifiers/source/gameengine/Converter/BL_ActionActuator.h
branches/vgroup_modifiers/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/vgroup_modifiers/source/gameengine/Converter/BL_MeshDeformer.h
branches/vgroup_modifiers/source/gameengine/Converter/BL_ShapeDeformer.h
branches/vgroup_modifiers/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/vgroup_modifiers/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/vgroup_modifiers/source/gameengine/Converter/KX_IpoConvert.cpp
branches/vgroup_modifiers/source/gameengine/GameLogic/SCA_2DFilterActuator.h
branches/vgroup_modifiers/source/gameengine/GameLogic/SCA_PythonController.h
branches/vgroup_modifiers/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/vgroup_modifiers/source/gameengine/GamePlayer/xembed/npunix.c
branches/vgroup_modifiers/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_GameObject.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Scene.cpp
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Scene.h
branches/vgroup_modifiers/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/vgroup_modifiers/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
branches/vgroup_modifiers/source/gameengine/Network/NG_NetworkDeviceInterface.h
branches/vgroup_modifiers/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/vgroup_modifiers/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/vgroup_modifiers/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_CameraData.h
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
branches/vgroup_modifiers/source/gameengine/SceneGraph/SG_DList.h
branches/vgroup_modifiers/source/gameengine/SceneGraph/SG_IObject.h
branches/vgroup_modifiers/source/gameengine/SceneGraph/SG_QList.h
branches/vgroup_modifiers/source/gameengine/SceneGraph/SG_Spatial.cpp
branches/vgroup_modifiers/source/gameengine/VideoTexture/Exception.h
branches/vgroup_modifiers/source/gameengine/VideoTexture/ImageBase.cpp
branches/vgroup_modifiers/source/gameengine/VideoTexture/ImageRender.cpp
branches/vgroup_modifiers/source/tests/check_deprecated.py
Added Paths:
-----------
branches/vgroup_modifiers/intern/tools/credits_svn_gen.py
Property Changed:
----------------
branches/vgroup_modifiers/
branches/vgroup_modifiers/doc/python_api/rst/info_tips_and_tricks.rst
branches/vgroup_modifiers/source/blender/editors/space_outliner/
Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39846
+ /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39930
Modified: branches/vgroup_modifiers/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/vgroup_modifiers/doc/python_api/rst/bge.types.rst 2011-09-05 16:25:42 UTC (rev 39931)
+++ branches/vgroup_modifiers/doc/python_api/rst/bge.types.rst 2011-09-05 16:27:25 UTC (rev 39932)
@@ -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.
Property changes on: branches/vgroup_modifiers/doc/python_api/rst/info_tips_and_tricks.rst
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: branches/vgroup_modifiers/intern/guardedalloc/MEM_sys_types.h
===================================================================
--- branches/vgroup_modifiers/intern/guardedalloc/MEM_sys_types.h 2011-09-05 16:25:42 UTC (rev 39931)
+++ branches/vgroup_modifiers/intern/guardedalloc/MEM_sys_types.h 2011-09-05 16:27:25 UTC (rev 39932)
@@ -88,7 +88,7 @@
#define _UINTPTR_T_DEFINED
#endif
-#elif defined(__linux__) || defined(__NetBSD__)
+#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__)
/* Linux-i386, Linux-Alpha, Linux-ppc */
#include <stdint.h>
Modified: branches/vgroup_modifiers/intern/iksolver/intern/IK_QSegment.cpp
===================================================================
--- branches/vgroup_modifiers/intern/iksolver/intern/IK_QSegment.cpp 2011-09-05 16:25:42 UTC (rev 39931)
+++ branches/vgroup_modifiers/intern/iksolver/intern/IK_QSegment.cpp 2011-09-05 16:27:25 UTC (rev 39932)
@@ -319,7 +319,7 @@
else {
IK_QSegment *seg = m_child;
- while (seg->m_sibling != child);
+ while (seg->m_sibling != child)
seg = seg->m_sibling;
if (child == seg->m_sibling)
Modified: branches/vgroup_modifiers/intern/opennl/superlu/superlu_sys_types.h
===================================================================
--- branches/vgroup_modifiers/intern/opennl/superlu/superlu_sys_types.h 2011-09-05 16:25:42 UTC (rev 39931)
+++ branches/vgroup_modifiers/intern/opennl/superlu/superlu_sys_types.h 2011-09-05 16:27:25 UTC (rev 39932)
@@ -89,7 +89,7 @@
#define _UINTPTR_T_DEFINED
#endif
-#elif defined(__linux__) || defined(__NetBSD__)
+#elif defined(__linux__) || defined(__NetBSD__) || defined(__OpenBSD__)
/* Linux-i386, Linux-Alpha, Linux-ppc */
#include <stdint.h>
Copied: branches/vgroup_modifiers/intern/tools/credits_svn_gen.py (from rev 39930, trunk/blender/intern/tools/credits_svn_gen.py)
===================================================================
--- branches/vgroup_modifiers/intern/tools/credits_svn_gen.py (rev 0)
+++ branches/vgroup_modifiers/intern/tools/credits_svn_gen.py 2011-09-05 16:27:25 UTC (rev 39932)
@@ -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",
+ "mfoxdogg": "Michael Fox",
+ "mindrones": "Luca Bonavita",
+ "mmikkelsen": "Morten Mikkelsen",
+ "moguri": "Mitchell Stokes",
+ "nazgul": "Sergey Sharybin",
+ "nexyon": "Joerg Mueller",
+ "nicholasbishop": "Nicholas Bishop",
+ "n_t": "Nils Thuerey",
+ "pidhash": "Joilnen Leite",
+ "psy-fi": "Antony Riakiotakis",
+ "schlaile": "Peter Schlaile",
+ "scourage": "Robert Holcomb",
+ "sgefant": "Stefan Gartner",
+ "sirdude": "sirdude",
+ "smerch": "Alex Sytnik",
+ "snailrose": "Charlie Carley",
+ "stiv": "Stephen Swaney",
+ "theeth": "Martin Poirier",
+ "ton": "Ton Roosendaal",
+ "vekoon": "Elia Sarti",
+ "xat": "Xavier Thomas",
+ "zaghaghi": "Hamed Zaghaghi",
+ "zanqdo": "Daniel Salazar",
+ "zuster": "Daniel Dunbar",
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list