[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39431] branches/soc-2011-avocado/blender: Merged Bmesh trunk changes r39407:39430 into Avocado branch.

[shuvro sarker]

Revision: 39431
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39431
Author:   shuvro
Date:     2011-08-16 04:05:27 +0000 (Tue, 16 Aug 2011)
Log Message:
-----------
Merged Bmesh trunk changes r39407:39430 into Avocado branch.

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

Modified Paths:
--------------
    branches/soc-2011-avocado/blender/release/scripts/presets/keyconfig/maya.py
    branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/soc-2011-avocado/blender/source/blender/bmesh/operators/connectops.c
    branches/soc-2011-avocado/blender/source/blender/bmesh/operators/mesh_conv.c
    branches/soc-2011-avocado/blender/source/blender/editors/mesh/bmesh_tools.c
    branches/soc-2011-avocado/blender/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2011-avocado/blender/source/blender/editors/mesh/mesh_ops.c

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


Property changes on: branches/soc-2011-avocado/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender:36841-38067
/trunk/blender:31524-37335
   + /branches/bmesh/blender:36841-38067,39408-39430
/trunk/blender:31524-37335

Modified: branches/soc-2011-avocado/blender/release/scripts/presets/keyconfig/maya.py
===================================================================
--- branches/soc-2011-avocado/blender/release/scripts/presets/keyconfig/maya.py	2011-08-16 01:16:51 UTC (rev 39430)
+++ branches/soc-2011-avocado/blender/release/scripts/presets/keyconfig/maya.py	2011-08-16 04:05:27 UTC (rev 39431)
@@ -344,9 +344,7 @@
 kmi = km.keymap_items.new('mesh.dupli_extrude_cursor', 'ACTIONMOUSE', 'CLICK', ctrl=True)
 kmi = km.keymap_items.new('mesh.delete', 'X', 'PRESS')
 kmi = km.keymap_items.new('mesh.delete', 'DEL', 'PRESS')
-kmi = km.keymap_items.new('mesh.knife_cut', 'LEFTMOUSE', 'PRESS', key_modifier='K')
-kmi = km.keymap_items.new('mesh.knife_cut', 'LEFTMOUSE', 'PRESS', shift=True, key_modifier='K')
-kmi.properties.type = 'MIDPOINTS'
+kmi = km.keymap_items.new('mesh.knifetool', 'K', 'PRESS')
 kmi = km.keymap_items.new('object.vertex_parent_set', 'P', 'PRESS', ctrl=True)
 kmi = km.keymap_items.new('wm.call_menu', 'W', 'PRESS', ctrl=True)
 kmi.properties.name = 'VIEW3D_MT_edit_mesh_specials'


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36841-38067
/trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36841-38067
/trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36841-38067
/trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36841-38067
/trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36841-38067
/trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36841-38067
/trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36841-38067
/trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36841-38067
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36841-38067
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36841-38067
/trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36841-38067
/trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36841-38067
/trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py:36841-38067
/trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py:36841-38067
/trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py:36841-38067
/trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-37335
   + /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py:36841-38067,39408-39430
/trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-37335


Property changes on: branches/soc-2011-avocado/blender/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36841-38067
/trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-37335

@@ Diff output truncated at 10240 characters. @@