[Bf-blender-cvs] [dd2e967] soc-2013-depsgraph_mt: Merge branch 'master' into soc-2013-depsgraph_mt

[Sergey Sharybin]

Commit: dd2e967fce8f92a8ef3d4b0ec73dc995af2585fa
Author: Sergey Sharybin
Date:   Fri Dec 13 16:12:57 2013 +0600
http://developer.blender.org/rBdd2e967fce8f92a8ef3d4b0ec73dc995af2585fa

Merge branch 'master' into soc-2013-depsgraph_mt

Conflicts:
	release/scripts/startup/bl_ui/properties_data_curve.py

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



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

diff --cc source/blender/editors/mesh/editmesh_utils.c
index 8bef23c,4982ce3..a7ebd39
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@@ -39,11 -39,10 +39,12 @@@
  
  #include "BKE_DerivedMesh.h"
  #include "BKE_context.h"
 +#include "BKE_global.h"
  #include "BKE_depsgraph.h"
  #include "BKE_key.h"
 +#include "BKE_main.h"
  #include "BKE_mesh.h"
+ #include "BKE_mesh_mapping.h"
  #include "BKE_report.h"
  #include "BKE_editmesh.h"
  #include "BKE_editmesh_bvh.h"