[Bf-blender-cvs] [cb22caa8c78] blender2.8: Merge branch 'master' into blender2.8

Campbell Barton noreply at git.blender.org
Wed May 30 08:49:50 CEST 2018


Commit: cb22caa8c78ad2f4453a83683c97effb7fde862d
Author: Campbell Barton
Date:   Wed May 30 08:49:34 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBcb22caa8c78ad2f4453a83683c97effb7fde862d

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/include/ED_object.h
index 8e844d327e2,f94927c0336..efa779c29a1
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@@ -123,14 -116,10 +123,14 @@@ enum 
  	EM_FREEDATA         = (1 << 0),
  	EM_WAITCURSOR       = (1 << 1),
  	EM_IGNORE_LAYER     = (1 << 3),
 +	EM_NO_CONTEXT       = (1 << 4),
  };
- void ED_object_editmode_exit_ex(
 -bool ED_object_editmode_exit_ex(struct Scene *scene, struct Object *obedit, int flag);
++bool ED_object_editmode_exit_ex(
 +        struct Scene *scene, struct Object *obedit, int flag);
- void ED_object_editmode_exit(struct bContext *C, int flag);
+ bool ED_object_editmode_exit(struct bContext *C, int flag);
 +
- void ED_object_editmode_enter_ex(struct Scene *scene, struct Object *ob, int flag);
- void ED_object_editmode_enter(struct bContext *C, int flag);
++bool ED_object_editmode_enter_ex(struct Scene *scene, struct Object *ob, int flag);
+ bool ED_object_editmode_enter(struct bContext *C, int flag);
  bool ED_object_editmode_load(struct Object *obedit);
  
  bool ED_object_editmode_calc_active_center(struct Object *obedit, const bool select_only, float r_center[3]);
@@@ -239,10 -213,11 +240,12 @@@ bool ED_object_modifier_remove(struct R
  void ED_object_modifier_clear(struct Main *bmain, struct Object *ob);
  int ED_object_modifier_move_down(struct ReportList *reports, struct Object *ob, struct ModifierData *md);
  int ED_object_modifier_move_up(struct ReportList *reports, struct Object *ob, struct ModifierData *md);
- int ED_object_modifier_convert(struct ReportList *reports, struct Main *bmain, struct Scene *scene,
-                                struct ViewLayer *view_layer, struct Object *ob, struct ModifierData *md);
- int ED_object_modifier_apply(struct ReportList *reports, struct Depsgraph *depsgraph, struct Scene *scene,
-                              struct Object *ob, struct ModifierData *md, int mode);
+ int ED_object_modifier_convert(
+         struct ReportList *reports, struct Main *bmain, struct Scene *scene,
 -        struct Object *ob, struct ModifierData *md);
 -int ED_object_modifier_apply(struct ReportList *reports, struct Scene *scene,
 -                             struct Object *ob, struct ModifierData *md, int mode);
++        struct ViewLayer *view_layer, struct Object *ob, struct ModifierData *md);
++int ED_object_modifier_apply(
++        struct ReportList *reports, struct Depsgraph *depsgraph, struct Scene *scene,
++        struct Object *ob, struct ModifierData *md, int mode);
  int ED_object_modifier_copy(struct ReportList *reports, struct Object *ob, struct ModifierData *md);
  
  bool ED_object_iter_other(
@@@ -262,12 -237,9 +265,13 @@@ const struct EnumPropertyItem *ED_objec
          bool *r_free,
          const unsigned int selection_mask);
  
- void ED_object_check_force_modifiers(struct Main *bmain, struct Scene *scene, struct Object *object);
+ void ED_object_check_force_modifiers(
+         struct Main *bmain, struct Scene *scene, struct Object *object);
  
 +/* object_facemap_ops.c */
 +void ED_object_facemap_face_add(struct Object *ob, struct bFaceMap *fmap, int facenum);
 +void ED_object_facemap_face_remove(struct Object *ob, struct bFaceMap *fmap, int facenum);
 +
  #ifdef __cplusplus
  }
  #endif
diff --cc source/blender/editors/object/object_edit.c
index 57d929ceccb,98b1a7438c6..65fe578a602
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@@ -281,11 -456,11 +281,11 @@@ bool ED_object_editmode_exit_ex(Scene *
  	if (ED_object_editmode_load_ex(G.main, obedit, freedata) == false) {
  		/* in rare cases (background mode) its possible active object
  		 * is flagged for editmode, without 'obedit' being set [#35489] */
 -		if (UNLIKELY(scene->basact && (scene->basact->object->mode & OB_MODE_EDIT))) {
 -			scene->basact->object->mode &= ~OB_MODE_EDIT;
 +		if (UNLIKELY(obedit && obedit->mode & OB_MODE_EDIT)) {
 +			obedit->mode &= ~OB_MODE_EDIT;
  		}
  		if (flag & EM_WAITCURSOR) waitcursor(0);
- 		return;
+ 		return true;
  	}
  
  	/* freedata only 0 now on file saves and render */
@@@ -319,23 -498,53 +320,25 @@@ bool ED_object_editmode_exit(bContext *
  {
  	Scene *scene = CTX_data_scene(C);
  	Object *obedit = CTX_data_edit_object(C);
- 	ED_object_editmode_exit_ex(scene, obedit, flag);
+ 	return ED_object_editmode_exit_ex(scene, obedit, flag);
  }
  
- void ED_object_editmode_enter_ex(Scene *scene, Object *ob, int flag)
 -bool ED_object_editmode_enter(bContext *C, int flag)
++bool ED_object_editmode_enter_ex(Scene *scene, Object *ob, int flag)
  {
 -	Scene *scene = CTX_data_scene(C);
 -	Base *base = NULL;
 -	Object *ob;
 -	ScrArea *sa = CTX_wm_area(C);
 -	View3D *v3d = NULL;
  	bool ok = false;
  
- 	if (ELEM(NULL, ob, ob->data)) return;
- 	if (ID_IS_LINKED(ob)) return;
 -	if (ID_IS_LINKED(scene)) {
 -		return false;
 -	}
 -
 -	if (sa && sa->spacetype == SPACE_VIEW3D)
 -		v3d = sa->spacedata.first;
 -
 -	if ((flag & EM_IGNORE_LAYER) == 0) {
 -		base = CTX_data_active_base(C); /* active layer checked here for view3d */
 -
 -		if ((base == NULL) ||
 -		    (v3d && (base->lay & v3d->lay) == 0) ||
 -		    (!v3d && (base->lay & scene->lay) == 0))
 -		{
 -			return false;
 -		}
 -	}
 -	else {
 -		base = scene->basact;
 -	}
 -
 -	if (ELEM(NULL, base, base->object, base->object->data)) {
++	if (ELEM(NULL, ob, ob->data) || ID_IS_LINKED(ob)) {
+ 		return false;
+ 	}
  
 -	ob = base->object;
 -
  	/* this checks actual object->data, for cases when other scenes have it in editmode context */
- 	if (BKE_object_is_in_editmode(ob))
- 		return;
- 	
+ 	if (BKE_object_is_in_editmode(ob)) {
+ 		return true;
+ 	}
+ 
  	if (BKE_object_obdata_is_libdata(ob)) {
  		error_libdata();
- 		return;
+ 		return false;
  	}
  
  	if (flag & EM_WAITCURSOR) waitcursor(1);
@@@ -358,31 -574,19 +361,17 @@@
  			BKE_editmesh_tessface_calc(em);
  		}
  
 -		WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_MESH, scene);
 +		WM_main_add_notifier(NC_SCENE | ND_MODE | NS_EDITMODE_MESH, NULL);
  	}
  	else if (ob->type == OB_ARMATURE) {
- 		bArmature *arm = ob->data;
- 		if (!arm) return;
- 		/*
- 		 * The function BKE_object_obdata_is_libdata make a problem here, the
- 		 * check for ob->proxy return 0 and let blender enter to edit mode
- 		 * this causes a crash when you try leave the edit mode.
- 		 * The problem is that i can't remove the ob->proxy check from
- 		 * BKE_object_obdata_is_libdata that prevent the bugfix #6614, so
- 		 * i add this little hack here.
- 		 */
- 		if (ID_IS_LINKED(arm)) {
- 			error_libdata();
- 			return;
- 		}
  		ok = 1;
- 		ED_armature_to_edit(arm);
 -		scene->obedit = ob;
+ 		ED_armature_to_edit(ob->data);
  		/* to ensure all goes in restposition and without striding */
 -		DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); /* XXX: should this be OB_RECALC_DATA? */
 +		DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); /* XXX: should this be OB_RECALC_DATA? */
  
 -		WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_ARMATURE, scene);
 +		WM_main_add_notifier(NC_SCENE | ND_MODE | NS_EDITMODE_ARMATURE, scene);
  	}
  	else if (ob->type == OB_FONT) {
 -		scene->obedit = ob; /* XXX for context */
  		ok = 1;
  		ED_curve_editfont_make(ob);
  
@@@ -418,29 -624,12 +407,31 @@@
  	}
  
  	if (flag & EM_WAITCURSOR) waitcursor(0);
+ 
+ 	return (ob->mode & OB_MODE_EDIT) != 0;
  }
  
- void ED_object_editmode_enter(bContext *C, int flag)
++bool ED_object_editmode_enter(bContext *C, int flag)
 +{
 +	Scene *scene = CTX_data_scene(C);
 +	ViewLayer *view_layer = CTX_data_view_layer(C);
 +	Object *ob;
 +
 +	if ((flag & EM_IGNORE_LAYER) == 0) {
 +		ob = CTX_data_active_object(C); /* active layer checked here for view3d */
 +	}
 +	else {
 +		ob = view_layer->basact->object;
 +	}
- 	if (ob == NULL) return;
- 	if (ID_IS_LINKED(ob)) return;
- 
- 	ED_object_editmode_enter_ex(scene, ob, flag);
++	if ((ob == NULL) || ID_IS_LINKED(ob)) {
++		return false;
++	}
++	return ED_object_editmode_enter_ex(scene, ob, flag);
 +}
 +
  static int editmode_toggle_exec(bContext *C, wmOperator *op)
  {
 +	struct wmMsgBus *mbus = CTX_wm_message_bus(C);
  	const int mode_flag = OB_MODE_EDIT;
  	const bool is_mode_set = (CTX_data_edit_object(C) != NULL);
  	Scene *scene =  CTX_data_scene(C);



More information about the Bf-blender-cvs mailing list