[Bf-blender-cvs] [8a20cd92a9c] temp-object-multi-mode: Merge branch '28' into temp-object-multi-mode

Campbell Barton noreply at git.blender.org
Tue Apr 3 14:34:42 CEST 2018


Commit: 8a20cd92a9cbd107c651e57d3b40fa0e84f47757
Author: Campbell Barton
Date:   Tue Apr 3 14:34:37 2018 +0200
Branches: temp-object-multi-mode
https://developer.blender.org/rB8a20cd92a9cbd107c651e57d3b40fa0e84f47757

Merge branch '28' into temp-object-multi-mode

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



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

diff --cc source/blender/editors/include/ED_mesh.h
index 1a541a428cd,b9723e3865e..cacf15e0875
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@@ -63,7 -63,7 +63,8 @@@ struct UvMapVert
  struct ToolSettings;
  struct Object;
  struct rcti;
 +struct ViewLayer;
+ struct UndoType;
  
  /* editmesh_utils.c */
  void           EDBM_verts_mirror_cache_begin_ex(struct BMEditMesh *em, const int axis,
diff --cc source/blender/editors/object/object_edit.c
index 31b63973745,0506225769c..23cb7667847
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@@ -400,9 -429,9 +407,9 @@@ void ED_object_editmode_enter_ex(WorkSp
  	}
  	else if (ob->type == OB_LATTICE) {
  		ok = 1;
- 		ED_lattice_editlatt_make(ob);
+ 		BKE_editlattice_make(ob);
  
 -		WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_LATTICE, scene);
 +		WM_main_add_notifier(NC_SCENE | ND_MODE | NS_EDITMODE_LATTICE, scene);
  	}
  	else if (ob->type == OB_SURF || ob->type == OB_CURVE) {
  		ok = 1;



More information about the Bf-blender-cvs mailing list