[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40541] branches/soc-2011-tomato: Merging trunk into soc-2011-tomato up to revision 40540
Sergey Sharybin
g.ulairi at gmail.com
Sun Sep 25 22:03:05 CEST 2011
Revision: 40541
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40541
Author: nazgul
Date: 2011-09-25 20:03:03 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
Merging trunk into soc-2011-tomato up to revision 40540
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40540
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/doc/python_api/rst/change_log.rst
branches/soc-2011-tomato/doc/python_api/sphinx_changelog_gen.py
branches/soc-2011-tomato/intern/elbeem/intern/solver_relax.h
branches/soc-2011-tomato/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_DropTargetWin32.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_EventManager.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2011-tomato/intern/smoke/intern/MERSENNETWISTER.h
branches/soc-2011-tomato/intern/string/STR_HashedString.h
branches/soc-2011-tomato/intern/tools/credits_svn_gen.py
branches/soc-2011-tomato/po/fr.po
branches/soc-2011-tomato/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-tomato/source/blender/avi/intern/options.c
branches/soc-2011-tomato/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/implicit.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
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/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-tomato/source/blender/blenlib/intern/storage.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-tomato/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframing.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2011-tomato/source/blender/editors/include/ED_anim_api.h
branches/soc-2011-tomato/source/blender/editors/include/UI_interface_icons.h
branches/soc-2011-tomato/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/screen/area.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/space_console/space_console.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_draw.c
branches/soc-2011-tomato/source/blender/editors/space_info/info_draw.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.h
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-tomato/source/blender/imbuf/intern/indexer.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_cloth_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_particle_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sound.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/render/intern/include/rendercore.h
branches/soc-2011-tomato/source/blender/render/intern/include/shading.h
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject.cpp
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/envmap.c
branches/soc-2011-tomato/source/blender/render/intern/source/rayshade.c
branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadeoutput.c
branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
branches/soc-2011-tomato/source/creator/creator.c
branches/soc-2011-tomato/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/KX_HashedPtr.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/ListValue.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ParentActuator.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/soc-2011-tomato/source/gameengine/Network/NG_NetworkMessage.h
branches/soc-2011-tomato/source/gameengine/SceneGraph/SG_Node.cpp
Added Paths:
-----------
branches/soc-2011-tomato/doc/python_api/blender_api_40524.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/vgroup_modifiers:38694-39989
/trunk/blender:36831-40509
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40540
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2011-09-25 15:37:06 UTC (rev 40540)
+++ branches/soc-2011-tomato/CMakeLists.txt 2011-09-25 20:03:03 UTC (rev 40541)
@@ -1009,7 +1009,7 @@
mark_as_advanced(SYSTEMSTUBS_LIBRARY)
if(SYSTEMSTUBS_LIBRARY)
set(PLATFORM_LINKLIBS stdc++ SystemStubs)
- else()
+ else()
set(PLATFORM_LINKLIBS stdc++)
endif()
Copied: branches/soc-2011-tomato/doc/python_api/blender_api_40524.py (from rev 40540, trunk/blender/doc/python_api/blender_api_40524.py)
===================================================================
--- branches/soc-2011-tomato/doc/python_api/blender_api_40524.py (rev 0)
+++ branches/soc-2011-tomato/doc/python_api/blender_api_40524.py 2011-09-25 20:03:03 UTC (rev 40541)
@@ -0,0 +1,58369 @@
+{'bpy.types': {'ActionFCurves': {'new': ('func_rna',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ 'Add a keyframe to the F-Curve',
+ ('data_path',
+ 'index',
+ 'action_group'),
+ ('string',
+ 'int',
+ 'string'),
+ ('pointer',)),
+ 'remove': ('func_rna',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ 'Remove action group',
+ ('fcurve',),
+ ('pointer',),
+ ())},
+ 'ActionGroup': {'channels': ('prop_rna',
+ 'Channels',
+ 'collection',
+ None,
+ 0,
+ None,
+ 'F-Curves in this group',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis),
+ 'custom_color': ('prop_rna',
+ 'Custom Color',
+ 'int',
+ (-2147483648,
+ 2147483647),
+ 0,
+ 0,
+ 'Index of custom color set',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis),
+ 'lock': ('prop_rna',
+ 'Lock',
+ 'boolean',
+ None,
+ 0,
+ False,
+ 'Action Group is locked',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis),
+ 'name': ('prop_rna',
+ 'Name',
+ 'string',
+ None,
+ 0,
+ '',
+ '',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis),
+ 'select': ('prop_rna',
+ 'Select',
+ 'boolean',
+ None,
+ 0,
+ False,
+ 'Action Group is selected',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis),
+ 'show_expanded': ('prop_rna',
+ 'Expanded',
+ 'boolean',
+ None,
+ 0,
+ False,
+ 'Action Group is expanded',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis)},
+ 'ActionGroups': {'new': ('func_rna',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ 'Add a keyframe to the curve',
+ ('name',),
+ ('string',),
+ ('pointer',)),
+ 'remove': ('func_rna',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ 'Remove action group',
+ ('action_group',),
+ ('pointer',),
+ ())},
+ 'ActionPoseMarkers': {'active': ('prop_rna',
+ 'Active Pose Marker',
+ 'pointer',
+ None,
+ 0,
+ None,
+ 'Active pose marker for this Action',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis),
+ 'active_index': ('prop_rna',
+ 'Active Pose Marker Index',
+ 'int',
+ (-2147483648,
+ 2147483647),
+ 0,
+ 0,
+ 'Index of active pose marker',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis),
+ 'new': ('func_rna',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ 'Add a pose marker to the action',
+ ('name',),
+ ('string',),
+ ('pointer',)),
+ 'remove': ('func_rna',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ 'Remove a timeline marker',
+ ('marker',),
+ ('pointer',),
+ ())},
+ 'Actuator': {'link': ('func_rna',
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ Ellipsis,
+ 'Link the actuator to a controller',
+ ('controller',),
+ ('pointer',),
+ ()),
+ 'name': ('prop_rna',
+ 'Name',
+ 'string',
+ None,
+ 0,
+ '',
+ '',
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list