[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39897] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 39896.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sat Sep 3 23:30:41 CEST 2011


Revision: 39897
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39897
Author:   kjym3
Date:     2011-09-03 21:30:40 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 39896.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39896

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_ISystemPaths.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_sys_types.h
    branches/soc-2008-mxcurioni/intern/iksolver/intern/IK_QSegment.cpp
    branches/soc-2008-mxcurioni/intern/opennl/superlu/superlu_sys_types.h
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sound.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_sys_types.h
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ExtraTags.cpp
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/space_text.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer_dv.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fluidsim.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/zbuf.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_MeshDeformer.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BlenderWorldInfo.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/InputParser.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonController.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_XORController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/bmfont.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/npunix.c
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
    branches/soc-2008-mxcurioni/source/gameengine/Network/NG_NetworkDeviceInterface.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_CameraData.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_BBox.cpp
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_DList.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_IObject.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_QList.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Spatial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/Exception.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/Exception.h
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageBase.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageRender.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/blendVideoTex.cpp
    branches/soc-2008-mxcurioni/source/tests/check_deprecated.py

Added Paths:
-----------
    branches/soc-2008-mxcurioni/doc/python_api/rst/info_tips_and_tricks.rst
    branches/soc-2008-mxcurioni/intern/tools/credits_svn_gen.py

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:34011-39826
   + /trunk/blender:34011-39896

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2011-09-03 20:48:47 UTC (rev 39896)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2011-09-03 21:30:40 UTC (rev 39897)
@@ -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/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst	2011-09-03 20:48:47 UTC (rev 39896)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/bge.types.rst	2011-09-03 21:30:40 UTC (rev 39897)
@@ -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.
       
@@ -1556,7 +1556,7 @@
       :arg blendin: the amount of blending between this animation and the previous one on this layer
       :type blendin: float
       :arg play_mode: the play mode
-      :type play_mode: KX_ACTION_PLAY, KX_ACTION_LOOP, or KX_ACTION_PING_PONG
+      :type play_mode: KX_ACTION_MODE_PLAY, KX_ACTION_MODE_LOOP, or KX_ACTION_MODE_PING_PONG
       :arg layer_weight: how much of the previous layer to use for blending (0 = add)
       :type layer_weight: float
       :arg ipo_flags: flags for the old IPO behaviors (force, etc)

Copied: branches/soc-2008-mxcurioni/doc/python_api/rst/info_tips_and_tricks.rst (from rev 39896, trunk/blender/doc/python_api/rst/info_tips_and_tricks.rst)
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/info_tips_and_tricks.rst	                        (rev 0)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/info_tips_and_tricks.rst	2011-09-03 21:30:40 UTC (rev 39897)
@@ -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
+=================

Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_ISystemPaths.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_ISystemPaths.cpp	2011-09-03 20:48:47 UTC (rev 39896)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_ISystemPaths.cpp	2011-09-03 21:30:40 UTC (rev 39897)
@@ -70,7 +70,7 @@
 #		ifdef GHOST_COCOA
 			m_systemPaths = new GHOST_SystemPathsCocoa ();
 #		else
-			m_systemPaths = new GHOST_SystemPathsarbon ();
+			m_systemPaths = new GHOST_SystemPathsCarbon ();
 #		endif
 #	else 
 		m_systemPaths = new GHOST_SystemPathsX11 ();

Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp	2011-09-03 20:48:47 UTC (rev 39896)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp	2011-09-03 21:30:40 UTC (rev 39897)
@@ -48,7 +48,9 @@
 #include "GHOST_EventButton.h"
 #include "GHOST_EventCursor.h"
 #include "GHOST_EventWheel.h"
+#ifdef WITH_INPUT_NDOF
 #include "GHOST_EventNDOF.h"
+#endif
 
 #include "GHOST_TimerManager.h"
 #include "GHOST_TimerTask.h"
@@ -1101,7 +1103,9 @@
 	GHOST_SystemCarbon* sys = (GHOST_SystemCarbon*) userData;
     OSStatus err = eventNotHandledErr;
 	GHOST_IWindow* window;
+#ifdef WITH_INPUT_NDOF
 	GHOST_TEventNDOFData data;
+#endif
 	UInt32 kind;
 	
     switch (::GetEventClass(event))
@@ -1122,6 +1126,7 @@
 			err = sys->handleKeyEvent(event);
 			break;
  		case kEventClassBlender :
+#ifdef WITH_INPUT_NDOF
 			window = sys->m_windowManager->getActiveWindow();
 			sys->m_ndofManager->GHOST_NDOFGetDatas(data);
 			kind = ::GetEventKind(event);
@@ -1137,6 +1142,7 @@
 //					printf("button\n");
 					break;
 			}
+#endif
 			err = noErr;
 			break;
 		default : 

Modified: branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_sys_types.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_sys_types.h	2011-09-03 20:48:47 UTC (rev 39896)
+++ branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_sys_types.h	2011-09-03 21:30:40 UTC (rev 39897)
@@ -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/soc-2008-mxcurioni/intern/iksolver/intern/IK_QSegment.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/iksolver/intern/IK_QSegment.cpp	2011-09-03 20:48:47 UTC (rev 39896)
+++ branches/soc-2008-mxcurioni/intern/iksolver/intern/IK_QSegment.cpp	2011-09-03 21:30:40 UTC (rev 39897)
@@ -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/soc-2008-mxcurioni/intern/opennl/superlu/superlu_sys_types.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/opennl/superlu/superlu_sys_types.h	2011-09-03 20:48:47 UTC (rev 39896)
+++ branches/soc-2008-mxcurioni/intern/opennl/superlu/superlu_sys_types.h	2011-09-03 21:30:40 UTC (rev 39897)
@@ -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/soc-2008-mxcurioni/intern/tools/credits_svn_gen.py (from rev 39896, trunk/blender/intern/tools/credits_svn_gen.py)
===================================================================
--- branches/soc-2008-mxcurioni/intern/tools/credits_svn_gen.py	                        (rev 0)
+++ branches/soc-2008-mxcurioni/intern/tools/credits_svn_gen.py	2011-09-03 21:30:40 UTC (rev 39897)
@@ -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):

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list