Merge branch 'blender2.8' of git.blender.org:blender into blender2.8

7 files changed, 22 insertions, 23 deletions

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index addf84224ac..53ca20e3c2a 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -511,7 +511,7 @@ bool BKE_object_is_in_editmode(const Object *ob)
 
 bool BKE_object_is_in_editmode_and_selected(const Object *ob)
 {
-	if ((ob->flag & SELECT) && (BKE_object_is_in_editmode(ob))) {
+	if ((ob->base_flag & BASE_SELECTED) && (BKE_object_is_in_editmode(ob))) {
 		return true;
 	}
 	return false;
diff --git a/source/blender/blenlib/intern/BLI_linklist_lockfree.c b/source/blender/blenlib/intern/BLI_linklist_lockfree.c
index c004ddb6b66..ef93ce3619f 100644
--- a/source/blender/blenlib/intern/BLI_linklist_lockfree.c
+++ b/source/blender/blenlib/intern/BLI_linklist_lockfree.c
@@ -77,12 +77,12 @@ void BLI_linklist_lockfree_insert(LockfreeLinkList *list,
 	do {
 		tail_node = list->tail;
 		keep_working =
-			(atomic_cas_ptr((void**)&tail_node->next, NULL, node) != NULL);
+			(atomic_cas_ptr((void **)&tail_node->next, NULL, node) != NULL);
 		if (keep_working) {
-			atomic_cas_ptr((void**)&list->tail, tail_node, tail_node->next);
+			atomic_cas_ptr((void **)&list->tail, tail_node, tail_node->next);
 		}
 	} while (keep_working);
-	atomic_cas_ptr((void**)&list->tail, tail_node, node);
+	atomic_cas_ptr((void **)&list->tail, tail_node, node);
 }
 
 LockfreeLinkNode *BLI_linklist_lockfree_begin(LockfreeLinkList *list)
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index fdd65add6d1..4ec4f43fb1e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7752,7 +7752,7 @@ static void direct_link_moviePlaneTracks(FileData *fd, ListBase *plane_tracks_ba
 		int i;
 
 		plane_track->point_tracks = newdataadr(fd, plane_track->point_tracks);
-		test_pointer_array(fd, (void**)&plane_track->point_tracks);
+		test_pointer_array(fd, (void **)&plane_track->point_tracks);
 		for (i = 0; i < plane_track->point_tracksnr; i++) {
 			plane_track->point_tracks[i] = newdataadr(fd, plane_track->point_tracks[i]);
 		}
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index e4581253286..94365be6b2e 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -4175,11 +4175,18 @@ static int edbm_quads_convert_to_tris_exec(bContext *C, wmOperator *op)
 		Object *obedit = objects[ob_index];
 		BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
+		if (em->bm->totfacesel == 0) {
+			continue;
+		}
+
 		BMOperator bmop;
 		BMOIter oiter;
 		BMFace *f;
 
-		EDBM_op_init(em, &bmop, op, "triangulate faces=%hf quad_method=%i ngon_method=%i", BM_ELEM_SELECT, quad_method, ngon_method);
+		EDBM_op_init(
+		        em, &bmop, op,
+		        "triangulate faces=%hf quad_method=%i ngon_method=%i",
+		        BM_ELEM_SELECT, quad_method, ngon_method);
 		BMO_op_exec(em->bm, &bmop);
 
 		/* select the output */
@@ -4192,12 +4199,9 @@ static int edbm_quads_convert_to_tris_exec(bContext *C, wmOperator *op)
 
 		EDBM_selectmode_flush(em);
 
-		// XXX, TODO
-#if 0
 		if (!EDBM_op_finish(em, &bmop, op, true)) {
-			return OPERATOR_CANCELLED;
+			continue;
 		}
-#endif
 
 		EDBM_update_generic(em, true, true);
 	}
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 248501a7baf..2550c4006f2 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -468,9 +468,7 @@ static int editmode_toggle_exec(bContext *C, wmOperator *op)
 			FOREACH_SELECTED_OBJECT_BEGIN(view_layer, ob)
 			{
 				if ((ob != obact) && (ob->type == obact->type)) {
-					if (ob->flag & SELECT) {
-						ED_object_editmode_enter_ex(scene, ob, EM_WAITCURSOR | EM_NO_CONTEXT);
-					}
+					ED_object_editmode_enter_ex(scene, ob, EM_WAITCURSOR | EM_NO_CONTEXT);
 				}
 			}
 			FOREACH_SELECTED_OBJECT_END;
@@ -482,9 +480,7 @@ static int editmode_toggle_exec(bContext *C, wmOperator *op)
 			FOREACH_SELECTED_OBJECT_BEGIN(view_layer, ob)
 			{
 				if ((ob != obact) && (ob->type == obact->type)) {
-					if (ob->flag & SELECT) {
-						ED_object_editmode_exit_ex(NULL, scene, ob, EM_FREEDATA | EM_WAITCURSOR);
-					}
+					ED_object_editmode_exit_ex(NULL, scene, ob, EM_FREEDATA | EM_WAITCURSOR);
 				}
 			}
 			FOREACH_SELECTED_OBJECT_END;
@@ -560,9 +556,7 @@ static int posemode_exec(bContext *C, wmOperator *op)
 					    (ob->type == OB_ARMATURE) &&
 					    (ob->mode & mode_flag))
 					{
-						if (ob->flag & SELECT) {
-							ED_object_posemode_exit_ex(bmain, ob);
-						}
+						ED_object_posemode_exit_ex(bmain, ob);
 					}
 				}
 				FOREACH_SELECTED_OBJECT_END;
@@ -580,9 +574,7 @@ static int posemode_exec(bContext *C, wmOperator *op)
 					    (ob->mode == OB_MODE_OBJECT) &&
 					    (!ID_IS_LINKED(ob)))
 					{
-						if (ob->flag & SELECT) {
-							ED_object_posemode_enter_ex(bmain, ob);
-						}
+						ED_object_posemode_enter_ex(bmain, ob);
 					}
 				}
 				FOREACH_SELECTED_OBJECT_END;
diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c
index 4f332c09ce2..2ce699aa6e2 100644
--- a/source/blender/editors/space_text/text_ops.c
+++ b/source/blender/editors/space_text/text_ops.c
@@ -2063,6 +2063,9 @@ void TEXT_OT_delete(wmOperatorType *ot)
 	ot->exec = text_delete_exec;
 	ot->poll = text_edit_poll;
 
+	/* flags */
+	ot->flag = OPTYPE_UNDO;
+
 	/* properties */
 	RNA_def_enum(ot->srna, "type", delete_type_items, DEL_NEXT_CHAR, "Type", "Which part of the text to delete");
 }
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index 3367a568bc5..d2a18684e27 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -1734,7 +1734,7 @@ void GPU_pbvh_bmesh_buffers_update(
 					int i;
 
 #if 0
-					BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void**)v, 3);
+					BM_iter_as_array(bm, BM_VERTS_OF_FACE, f, (void **)v, 3);
 #endif
 					BM_face_as_array_vert_tri(f, v);