[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50061] branches/pyapi_devel_26: Merge from trunk: r49912-50060

Nathan Letwory nathan at letworyinteractive.com
Mon Aug 20 23:17:41 CEST 2012 

Revision: 50061
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50061
Author:   jesterking
Date:     2012-08-20 21:17:40 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
Merge from trunk: r49912-50060

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

Modified Paths:
--------------
    branches/pyapi_devel_26/CMakeLists.txt
    branches/pyapi_devel_26/GNUmakefile
    branches/pyapi_devel_26/build_files/cmake/config/blender_lite.cmake
    branches/pyapi_devel_26/build_files/scons/tools/btools.py
    branches/pyapi_devel_26/doc/python_api/rst/info_best_practice.rst
    branches/pyapi_devel_26/intern/CMakeLists.txt
    branches/pyapi_devel_26/intern/cycles/CMakeLists.txt
    branches/pyapi_devel_26/intern/ghost/GHOST_C-api.h
    branches/pyapi_devel_26/intern/iksolver/CMakeLists.txt
    branches/pyapi_devel_26/intern/iksolver/SConscript
    branches/pyapi_devel_26/release/scripts/modules/bpy/path.py
    branches/pyapi_devel_26/release/scripts/modules/console_python.py
    branches/pyapi_devel_26/release/scripts/startup/bl_operators/console.py
    branches/pyapi_devel_26/release/scripts/startup/bl_operators/node.py
    branches/pyapi_devel_26/release/scripts/startup/bl_ui/properties_animviz.py
    branches/pyapi_devel_26/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/pyapi_devel_26/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/pyapi_devel_26/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/pyapi_devel_26/release/scripts/startup/bl_ui/properties_particle.py
    branches/pyapi_devel_26/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_console.py
    branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_image.py
    branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_sequencer.py
    branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_userpref.py
    branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_view3d.py
    branches/pyapi_devel_26/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/pyapi_devel_26/source/blender/blenfont/intern/blf_font.c
    branches/pyapi_devel_26/source/blender/blenfont/intern/blf_glyph.c
    branches/pyapi_devel_26/source/blender/blenkernel/BKE_colortools.h
    branches/pyapi_devel_26/source/blender/blenkernel/BKE_fcurve.h
    branches/pyapi_devel_26/source/blender/blenkernel/BKE_mask.h
    branches/pyapi_devel_26/source/blender/blenkernel/BKE_mball.h
    branches/pyapi_devel_26/source/blender/blenkernel/BKE_node.h
    branches/pyapi_devel_26/source/blender/blenkernel/BKE_object.h
    branches/pyapi_devel_26/source/blender/blenkernel/BKE_sequencer.h
    branches/pyapi_devel_26/source/blender/blenkernel/CMakeLists.txt
    branches/pyapi_devel_26/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/CCGSubSurf.h
    branches/pyapi_devel_26/source/blender/blenkernel/intern/anim.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/colortools.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/constraint.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/customdata.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/depsgraph.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/fcurve.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/group.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/image.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/ipo.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/key.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/mask.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/mask_rasterize.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/mball.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/mesh.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/node.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/object.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/scene.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/seqcache.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/seqeffects.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/sequencer.c
    branches/pyapi_devel_26/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/pyapi_devel_26/source/blender/blenlib/BLI_listbase.h
    branches/pyapi_devel_26/source/blender/blenlib/BLI_rect.h
    branches/pyapi_devel_26/source/blender/blenlib/intern/listbase.c
    branches/pyapi_devel_26/source/blender/blenlib/intern/rct.c
    branches/pyapi_devel_26/source/blender/blenlib/intern/voronoi.c
    branches/pyapi_devel_26/source/blender/blenloader/intern/readfile.c
    branches/pyapi_devel_26/source/blender/blenloader/intern/writefile.c
    branches/pyapi_devel_26/source/blender/bmesh/intern/bmesh_core.c
    branches/pyapi_devel_26/source/blender/bmesh/intern/bmesh_error.h
    branches/pyapi_devel_26/source/blender/bmesh/intern/bmesh_marking.c
    branches/pyapi_devel_26/source/blender/bmesh/intern/bmesh_mods.c
    branches/pyapi_devel_26/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/pyapi_devel_26/source/blender/bmesh/intern/bmesh_polygon.c
    branches/pyapi_devel_26/source/blender/bmesh/intern/bmesh_queries.c
    branches/pyapi_devel_26/source/blender/collada/EffectExporter.cpp
    branches/pyapi_devel_26/source/blender/collada/GeometryExporter.cpp
    branches/pyapi_devel_26/source/blender/collada/ImageExporter.cpp
    branches/pyapi_devel_26/source/blender/collada/InstanceWriter.cpp
    branches/pyapi_devel_26/source/blender/compositor/CMakeLists.txt
    branches/pyapi_devel_26/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/pyapi_devel_26/source/blender/compositor/intern/COM_MemoryBuffer.cpp
    branches/pyapi_devel_26/source/blender/compositor/intern/COM_MemoryBuffer.h
    branches/pyapi_devel_26/source/blender/compositor/intern/COM_SocketReader.h
    branches/pyapi_devel_26/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/pyapi_devel_26/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    branches/pyapi_devel_26/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_BokehImageOperation.h
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_DisplaceOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_InpaintOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_MapUVOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_MovieDistortionOperation.h
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_ReadBufferOperation.h
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
    branches/pyapi_devel_26/source/blender/editors/animation/anim_channels_defines.c
    branches/pyapi_devel_26/source/blender/editors/animation/anim_deps.c
    branches/pyapi_devel_26/source/blender/editors/animation/anim_filter.c
    branches/pyapi_devel_26/source/blender/editors/animation/anim_markers.c
    branches/pyapi_devel_26/source/blender/editors/armature/editarmature.c
    branches/pyapi_devel_26/source/blender/editors/gpencil/gpencil_edit.c
    branches/pyapi_devel_26/source/blender/editors/gpencil/gpencil_paint.c
    branches/pyapi_devel_26/source/blender/editors/include/ED_clip.h
    branches/pyapi_devel_26/source/blender/editors/include/ED_image.h
    branches/pyapi_devel_26/source/blender/editors/include/ED_node.h
    branches/pyapi_devel_26/source/blender/editors/include/UI_interface.h
    branches/pyapi_devel_26/source/blender/editors/interface/interface.c
    branches/pyapi_devel_26/source/blender/editors/interface/interface_draw.c
    branches/pyapi_devel_26/source/blender/editors/interface/interface_handlers.c
    branches/pyapi_devel_26/source/blender/editors/interface/interface_icons.c
    branches/pyapi_devel_26/source/blender/editors/interface/interface_intern.h
    branches/pyapi_devel_26/source/blender/editors/interface/interface_layout.c
    branches/pyapi_devel_26/source/blender/editors/interface/interface_ops.c
    branches/pyapi_devel_26/source/blender/editors/interface/interface_panel.c
    branches/pyapi_devel_26/source/blender/editors/interface/interface_regions.c
    branches/pyapi_devel_26/source/blender/editors/interface/interface_templates.c
    branches/pyapi_devel_26/source/blender/editors/interface/interface_widgets.c
    branches/pyapi_devel_26/source/blender/editors/interface/resources.c
    branches/pyapi_devel_26/source/blender/editors/interface/view2d.c
    branches/pyapi_devel_26/source/blender/editors/interface/view2d_ops.c
    branches/pyapi_devel_26/source/blender/editors/mesh/editmesh_tools.c
    branches/pyapi_devel_26/source/blender/editors/object/object_edit.c
    branches/pyapi_devel_26/source/blender/editors/object/object_modifier.c
    branches/pyapi_devel_26/source/blender/editors/object/object_select.c
    branches/pyapi_devel_26/source/blender/editors/object/object_transform.c
    branches/pyapi_devel_26/source/blender/editors/physics/particle_edit.c
    branches/pyapi_devel_26/source/blender/editors/screen/area.c
    branches/pyapi_devel_26/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/pyapi_devel_26/source/blender/editors/space_clip/clip_editor.c
    branches/pyapi_devel_26/source/blender/editors/space_console/space_console.c
    branches/pyapi_devel_26/source/blender/editors/space_graph/graph_edit.c
    branches/pyapi_devel_26/source/blender/editors/space_image/image_buttons.c
    branches/pyapi_devel_26/source/blender/editors/space_image/image_edit.c
    branches/pyapi_devel_26/source/blender/editors/space_image/image_ops.c
    branches/pyapi_devel_26/source/blender/editors/space_logic/logic_buttons.c
    branches/pyapi_devel_26/source/blender/editors/space_node/drawnode.c
    branches/pyapi_devel_26/source/blender/editors/space_node/node_edit.c
    branches/pyapi_devel_26/source/blender/editors/space_node/node_templates.c
    branches/pyapi_devel_26/source/blender/editors/space_node/node_view.c
    branches/pyapi_devel_26/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/pyapi_devel_26/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/pyapi_devel_26/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/pyapi_devel_26/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/pyapi_devel_26/source/blender/editors/space_text/text_ops.c
    branches/pyapi_devel_26/source/blender/editors/space_view3d/drawobject.c
    branches/pyapi_devel_26/source/blender/editors/space_view3d/view3d_edit.c
    branches/pyapi_devel_26/source/blender/editors/space_view3d/view3d_intern.h
    branches/pyapi_devel_26/source/blender/editors/space_view3d/view3d_ops.c
    branches/pyapi_devel_26/source/blender/editors/space_view3d/view3d_select.c
    branches/pyapi_devel_26/source/blender/editors/space_view3d/view3d_view.c
    branches/pyapi_devel_26/source/blender/editors/transform/transform_conversions.c
    branches/pyapi_devel_26/source/blender/editors/transform/transform_manipulator.c
    branches/pyapi_devel_26/source/blender/editors/transform/transform_orientations.c
    branches/pyapi_devel_26/source/blender/gpu/intern/gpu_draw.c
    branches/pyapi_devel_26/source/blender/ikplugin/CMakeLists.txt
    branches/pyapi_devel_26/source/blender/ikplugin/intern/ikplugin_api.c
    branches/pyapi_devel_26/source/blender/imbuf/IMB_imbuf_types.h
    branches/pyapi_devel_26/source/blender/makesdna/DNA_sequence_types.h
    branches/pyapi_devel_26/source/blender/makesdna/DNA_userdef_types.h
    branches/pyapi_devel_26/source/blender/makesrna/RNA_enum_types.h
    branches/pyapi_devel_26/source/blender/makesrna/intern/rna_mesh.c
    branches/pyapi_devel_26/source/blender/makesrna/intern/rna_object.c
    branches/pyapi_devel_26/source/blender/makesrna/intern/rna_sequencer.c
    branches/pyapi_devel_26/source/blender/makesrna/intern/rna_space.c
    branches/pyapi_devel_26/source/blender/makesrna/intern/rna_ui_api.c
    branches/pyapi_devel_26/source/blender/makesrna/intern/rna_userdef.c
    branches/pyapi_devel_26/source/blender/modifiers/intern/MOD_displace.c
    branches/pyapi_devel_26/source/blender/nodes/CMakeLists.txt
    branches/pyapi_devel_26/source/blender/nodes/SConscript
    branches/pyapi_devel_26/source/blender/nodes/composite/node_composite_tree.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_inpaint.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_trackpos.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/pyapi_devel_26/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/pyapi_devel_26/source/blender/python/intern/bpy.c
    branches/pyapi_devel_26/source/blender/render/intern/source/pipeline.c
    branches/pyapi_devel_26/source/blender/render/intern/source/render_result.c
    branches/pyapi_devel_26/source/blender/windowmanager/intern/wm_event_system.c
    branches/pyapi_devel_26/source/blender/windowmanager/intern/wm_gesture.c
    branches/pyapi_devel_26/source/blender/windowmanager/intern/wm_window.c
    branches/pyapi_devel_26/source/blenderplayer/CMakeLists.txt
    branches/pyapi_devel_26/source/creator/CMakeLists.txt
    branches/pyapi_devel_26/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/pyapi_devel_26/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/pyapi_devel_26/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/pyapi_devel_26/source/gameengine/Ketsji/BL_Texture.cpp
    branches/pyapi_devel_26/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/pyapi_devel_26/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/pyapi_devel_26/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
    branches/pyapi_devel_26/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h

Added Paths:
-----------
    branches/pyapi_devel_26/source/blender/blenkernel/intern/seqmodifier.c
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
    branches/pyapi_devel_26/source/blender/editors/space_sequencer/sequencer_modifier.c

Removed Paths:
-------------
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
    branches/pyapi_devel_26/source/blender/compositor/operations/COM_DistanceMatteOperation.h

Property Changed:
----------------
    branches/pyapi_devel_26/
    branches/pyapi_devel_26/source/blender/editors/interface/interface.c
    branches/pyapi_devel_26/source/blender/editors/sculpt_paint/


Property changes on: branches/pyapi_devel_26
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:48220-49921
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:48220-50060

Modified: branches/pyapi_devel_26/CMakeLists.txt
===================================================================
--- branches/pyapi_devel_26/CMakeLists.txt	2012-08-20 20:48:19 UTC (rev 50060)
+++ branches/pyapi_devel_26/CMakeLists.txt	2012-08-20 21:17:40 UTC (rev 50061)
@@ -126,11 +126,13 @@
 option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
 option(WITH_BUILDINFO     "Include extra build details (only disable for development & faster builds)" ON)
 option(WITH_IK_ITASC      "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
+option(WITH_IK_SOLVER     "Enable Legacy IK solver (only disable for development)" ON)
 option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
 option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 option(WITH_GAMEENGINE    "Enable Game Engine" ON)
 option(WITH_PLAYER        "Build Player" OFF)
 option(WITH_COMPOSITOR    "Enable the tile based nodal compositor" ON)
+option(WITH_COMPOSITOR_LEGACY "Enable legacy compositor" ON)
 
 # GHOST Windowing Library Options
 option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)
@@ -1795,6 +1797,7 @@
 	info_cfg_option(WITH_GAMEENGINE)
 	info_cfg_option(WITH_PLAYER)
 	info_cfg_option(WITH_BULLET)
+	info_cfg_option(WITH_IK_SOLVER)
 	info_cfg_option(WITH_IK_ITASC)
 	info_cfg_option(WITH_OPENCOLLADA)
 	info_cfg_option(WITH_FFTW3)

Modified: branches/pyapi_devel_26/GNUmakefile
===================================================================
--- branches/pyapi_devel_26/GNUmakefile	2012-08-20 20:48:19 UTC (rev 50060)
+++ branches/pyapi_devel_26/GNUmakefile	2012-08-20 21:17:40 UTC (rev 50061)
@@ -19,9 +19,9 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-# This Makefile does an out-of-source CMake build in ../build/`OS`_`CPU`
+# This Makefile does an out-of-source CMake build in ../build_`OS`_`CPU`
 # eg:
-#   ../build/Linux_i386
+#   ../build_linux_i386
 # This is for users who like to configure & build blender with a single command.
 
 
@@ -40,7 +40,7 @@
 endif
 
 ifndef BUILD_DIR
-	BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
+	BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build_$(OS_NCASE)
 endif
 
 

Modified: branches/pyapi_devel_26/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/pyapi_devel_26/build_files/cmake/config/blender_lite.cmake	2012-08-20 20:48:19 UTC (rev 50060)
+++ branches/pyapi_devel_26/build_files/cmake/config/blender_lite.cmake	2012-08-20 21:17:40 UTC (rev 50061)
@@ -18,6 +18,7 @@
 set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
 set(WITH_COMPOSITOR          OFF CACHE FORCE BOOL)
 set(WITH_GHOST_XDND          OFF CACHE FORCE BOOL)
+set(WITH_IK_SOLVER           OFF CACHE FORCE BOOL)
 set(WITH_IK_ITASC            OFF CACHE FORCE BOOL)
 set(WITH_IMAGE_CINEON        OFF CACHE FORCE BOOL)
 set(WITH_IMAGE_DDS           OFF CACHE FORCE BOOL)

Modified: branches/pyapi_devel_26/build_files/scons/tools/btools.py
===================================================================
--- branches/pyapi_devel_26/build_files/scons/tools/btools.py	2012-08-20 20:48:19 UTC (rev 50060)
+++ branches/pyapi_devel_26/build_files/scons/tools/btools.py	2012-08-20 21:17:40 UTC (rev 50061)
@@ -108,7 +108,7 @@
             'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC',
             'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB',
             'WITH_BF_FRAMESERVER',
-            'WITH_BF_COMPOSITOR',
+            'WITH_BF_COMPOSITOR', 'WITH_BF_COMPOSITOR_LEGACY',
             'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH',
             'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC', 'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH',
             'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH',
@@ -583,7 +583,8 @@
         ('BF_BOOST_LIBPATH', 'Boost library path', ''),
         ('BF_BOOST_LIB_STATIC', 'Boost static library', ''),
 
-        (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True))
+        (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True)),
+        (BoolVariable('WITH_BF_COMPOSITOR_LEGACY', 'Enable the legacy compositor', True))
     ) # end of opts.AddOptions()
 
     return localopts

Modified: branches/pyapi_devel_26/doc/python_api/rst/info_best_practice.rst
===================================================================
--- branches/pyapi_devel_26/doc/python_api/rst/info_best_practice.rst	2012-08-20 20:48:19 UTC (rev 50060)
+++ branches/pyapi_devel_26/doc/python_api/rst/info_best_practice.rst	2012-08-20 21:17:40 UTC (rev 50061)
@@ -75,7 +75,7 @@
 
 * layout.row()
 
-  Use row(), when you want more than 1 propertey in one line. 
+  Use row(), when you want more than 1 property in one line. 
   
   .. code-block:: python
 	 
@@ -145,7 +145,7 @@
 
 Modifying Lists
 ^^^^^^^^^^^^^^^
-In python we can add and remove from a list, This is slower when the list length is modified, especially at the start of the list, since all the data after the index of modification needs to be moved up or down 1 place.
+In python we can add and remove from a list, this is slower when the list length is modified, especially at the start of the list, since all the data after the index of modification needs to be moved up or down 1 place.
 
 The most simple way to add onto the end of the list is to use ``my_list.append(list_item)`` or ``my_list.extend(some_list)`` and the fastest way to remove an item is ``my_list.pop()`` or ``del my_list[-1]``.
 
@@ -154,13 +154,13 @@
 Sometimes its faster (but more memory hungry) to just rebuild the list.
 
 
-Say you want to remove all triangle faces in a list.
+Say you want to remove all triangular faces in a list.
 
 Rather than...
 
 .. code-block:: python
 
-   faces = mesh.faces[:]  # make a list copy of the meshes faces
+   faces = mesh.tessfaces[:]  # make a list copy of the meshes faces
    f_idx = len(faces)     # Loop backwards
    while f_idx:           # while the value is not 0
        f_idx -= 1
@@ -173,13 +173,13 @@
 
 .. code-block:: python
 
-   faces = [f for f in mesh.faces if len(f.vertices) != 3]
+   faces = [f for f in mesh.tessfaces if len(f.vertices) != 3]
 
 
 Adding List Items
 ^^^^^^^^^^^^^^^^^
 
-If you have a list that you want to add onto another list, rather then...
+If you have a list that you want to add onto another list, rather than...
 
 .. code-block:: python
 
@@ -205,6 +205,14 @@
        reverse_list.insert(0, list_item)
 
 
+Python provides more convenient ways to reverse a list using the slice method, but you may want to time this before relying on it too much:
+
+
+.. code-block:: python
+
+  some_reversed_list = some_list[::-1]
+
+
 Removing List Items
 ^^^^^^^^^^^^^^^^^^^
 
@@ -224,7 +232,7 @@
            my_list.pop(list_index)
 
 
-This example shows a fast way of removing items, for use in cases were where you can alter the list order without breaking the scripts functionality. This works by swapping 2 list items, so the item you remove is always last.
+This example shows a fast way of removing items, for use in cases where you can alter the list order without breaking the scripts functionality. This works by swapping 2 list items, so the item you remove is always last.
 
 .. code-block:: python
 
@@ -243,9 +251,9 @@
 Avoid Copying Lists
 ^^^^^^^^^^^^^^^^^^^
 
-When passing a list/dictionary to a function, it is faster to have the function modify the list rather then returning a new list so python doesn't have to duplicate the list in memory.
+When passing a list/dictionary to a function, it is faster to have the function modify the list rather than returning a new list so python doesn't have to duplicate the list in memory.
 
-Functions that modify a list in-place are more efficient then functions that create new lists.
+Functions that modify a list in-place are more efficient than functions that create new lists.
 
 
 This is generally slower so only use for functions when it makes sense not to modify the list in place.
@@ -273,22 +281,22 @@
 This really applies to any area of your code that involves a lot of string joining.
 
 
-Pythons string addition, *don't use if you can help it, especially when writing data in a loop.*
+Python’s string addition, *don't use if you can help it, especially when writing data in a loop.*
 
 >>> file.write(str1 + " " + str2 + " " + str3 + "\n")
 
 
-String formatting. Use this when you're writing string data from floats and int's
+String formatting. Use this when you're writing string data from floats and ints
 
 >>> file.write("%s %s %s\n" % (str1, str2, str3))
 
 
-Pythons string joining function. To join a list of strings

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list