[Bf-blender-cvs] [e5a1c2e] soc-2014-shapekey: Merge branch 'master' into soc-2014-shapekey

[Bastien Montagne]

Commit: e5a1c2ef65ebc27939e50386c318e0a61b58e66f
Author: Bastien Montagne
Date:   Fri Oct 10 22:07:14 2014 +0200
Branches: soc-2014-shapekey
https://developer.blender.org/rBe5a1c2ef65ebc27939e50386c318e0a61b58e66f

Merge branch 'master' into soc-2014-shapekey

Conflicts:
	release/datafiles/blender_icons.svg
	source/blender/editors/mesh/editmesh_tools.c
	source/blender/editors/object/object_shapekey.c

Note about blender_icons.svg: blindly reset to master state, hard to do otherwise on such file... :/

===================================================================



===================================================================

diff --cc source/blender/blenloader/intern/versioning_270.c
index 01ca8d2,d8da0a1..2e9aa25
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -42,8 -43,8 +43,9 @@@
  #include "DNA_object_types.h"
  #include "DNA_mesh_types.h"
  #include "DNA_modifier_types.h"
+ #include "DNA_particle_types.h"
  #include "DNA_linestyle_types.h"
 +#include "DNA_key_types.h"
  #include "DNA_actuator_types.h"
  
  #include "DNA_genfile.h"
diff --cc source/blender/editors/mesh/editmesh_tools.c
index 98ddd4d,20c7f4e..8eb34a8
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@@ -886,9 -879,12 +886,12 @@@ static int edbm_vert_connect_exec(bCont
  	BMOperator bmop;
  	const bool is_pair = (bm->totvertsel == 2);
  	int len;
 -	
 +
  	if (is_pair) {
- 		if (!EDBM_op_init(em, &bmop, op, "connect_vert_pair verts=%hv", BM_ELEM_SELECT)) {
+ 		if (!EDBM_op_init(em, &bmop, op,
+ 		                  "connect_vert_pair verts=%hv verts_exclude=%hv faces_exclude=%hf",
+ 		                  BM_ELEM_SELECT, BM_ELEM_HIDDEN, BM_ELEM_HIDDEN))
+ 		{
  			return OPERATOR_CANCELLED;
  		}
  	}