[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54317] trunk/blender/source/blender: own recent change to triangulate bmesh operator stopped filling in mapping slot 'face_map.out', not used by blender its self but useful for scripts, enable this again.

[Campbell Barton]

Revision: 54317
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54317
Author:   campbellbarton
Date:     2013-02-05 11:30:50 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
own recent change to triangulate bmesh operator stopped filling in mapping slot 'face_map.out', not used by blender its self but useful for scripts, enable this again.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
    trunk/blender/source/blender/bmesh/tools/bmesh_triangulate.c
    trunk/blender/source/blender/bmesh/tools/bmesh_triangulate.h
    trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
    trunk/blender/source/blender/modifiers/intern/MOD_triangulate.c

Modified: trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c	2013-02-05 09:42:40 UTC (rev 54316)
+++ trunk/blender/source/blender/bmesh/operators/bmo_triangulate.c	2013-02-05 11:30:50 UTC (rev 54317)
@@ -44,11 +44,12 @@
 void bmo_triangulate_exec(BMesh *bm, BMOperator *op)
 {
 	const bool use_beauty = BMO_slot_bool_get(op->slots_in, "use_beauty");
+	BMOpSlot *slot_facemap_out = BMO_slot_get(op->slots_out, "face_map.out");
 
 	BM_mesh_elem_hflag_disable_all(bm, BM_FACE | BM_EDGE, BM_ELEM_TAG, false);
 	BMO_slot_buffer_hflag_enable(bm, op->slots_in, "faces", BM_FACE, BM_ELEM_TAG, false);
 
-	BM_mesh_triangulate(bm, use_beauty, true);
+	BM_mesh_triangulate(bm, use_beauty, true, op, slot_facemap_out);
 
 	if (use_beauty) {
 		BMO_op_callf(bm, op->flag,

Modified: trunk/blender/source/blender/bmesh/tools/bmesh_triangulate.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_triangulate.c	2013-02-05 09:42:40 UTC (rev 54316)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_triangulate.c	2013-02-05 11:30:50 UTC (rev 54317)
@@ -30,28 +30,56 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
+#include "BLI_array.h"
 
 #include "bmesh.h"
 
 #include "bmesh_triangulate.h"  /* own include */
 
-void BM_mesh_triangulate(BMesh *bm, const bool use_beauty, const bool tag_only)
+/**
+ * a version of #BM_face_triangulate that maps to #BMOpSlot
+ */
+static void bm_face_triangulate_mapping(BMesh *bm, BMFace *face, const bool use_beauty, const bool use_tag,
+                                        BMOperator *op, BMOpSlot *slot_facemap_out)
 {
+	const int faces_array_tot = face->len - 3;
+	BMFace  **faces_array = BLI_array_alloca(faces_array, faces_array_tot);
+	BLI_assert(face->len > 3);
+
+	BM_face_triangulate(bm, face, faces_array, use_beauty, use_tag);
+
+	if (faces_array) {
+		int i;
+		BMO_slot_map_elem_insert(op, slot_facemap_out, face, face);
+		for (i = 0; i < faces_array_tot; i++) {
+			BMO_slot_map_elem_insert(op, slot_facemap_out, faces_array[i], face);
+		}
+	}
+}
+
+
+void BM_mesh_triangulate(BMesh *bm, const bool use_beauty, const bool tag_only,
+                         BMOperator *op, BMOpSlot *slot_facemap_out)
+{
 	BMIter iter;
 	BMFace *face;
 
-	if (tag_only == false) {
+	if (slot_facemap_out) {
+		/* same as below but call: bm_face_triangulate_mapping() */
 		BM_ITER_MESH (face, &iter, bm, BM_FACES_OF_MESH) {
 			if (face->len > 3) {
-				BM_face_triangulate(bm, face, NULL, use_beauty, false);
+				if (tag_only == false || BM_elem_flag_test(face, BM_ELEM_TAG)) {
+					bm_face_triangulate_mapping(bm, face, use_beauty, tag_only,
+					                            op, slot_facemap_out);
+				}
 			}
 		}
 	}
 	else {
 		BM_ITER_MESH (face, &iter, bm, BM_FACES_OF_MESH) {
-			if (BM_elem_flag_test(face, BM_ELEM_TAG)) {
-				if (face->len > 3) {
-					BM_face_triangulate(bm, face, NULL, use_beauty, true);
+			if (face->len > 3) {
+				if (tag_only == false || BM_elem_flag_test(face, BM_ELEM_TAG)) {
+					BM_face_triangulate(bm, face, NULL, use_beauty, tag_only);
 				}
 			}
 		}

Modified: trunk/blender/source/blender/bmesh/tools/bmesh_triangulate.h
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_triangulate.h	2013-02-05 09:42:40 UTC (rev 54316)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_triangulate.h	2013-02-05 11:30:50 UTC (rev 54317)
@@ -30,6 +30,7 @@
 #ifndef __BMESH_TRIAMGULATE_H__
 #define __BMESH_TRIAMGULATE_H__
 
-void BM_mesh_triangulate(BMesh *bm, const bool use_beauty, const bool tag_only);
+void BM_mesh_triangulate(BMesh *bm, const bool use_beauty, const bool tag_only,
+                         BMOperator *op, BMOpSlot *slot_facemap_out);
 
 #endif  /* __BMESH_TRIAMGULATE_H__ */

Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2013-02-05 09:42:40 UTC (rev 54316)
+++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c	2013-02-05 11:30:50 UTC (rev 54317)
@@ -4526,7 +4526,7 @@
 
 static void sculpt_dynamic_topology_triangulate(BMesh *bm)
 {
-	BM_mesh_triangulate(bm, false, false);
+	BM_mesh_triangulate(bm, false, false, NULL, NULL);
 }
 
 void sculpt_pbvh_clear(Object *ob)

Modified: trunk/blender/source/blender/modifiers/intern/MOD_triangulate.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_triangulate.c	2013-02-05 09:42:40 UTC (rev 54316)
+++ trunk/blender/source/blender/modifiers/intern/MOD_triangulate.c	2013-02-05 11:30:50 UTC (rev 54317)
@@ -42,7 +42,7 @@
 
 	bm = DM_to_bmesh(dm);
 
-	BM_mesh_triangulate(bm, (flag & MOD_TRIANGULATE_BEAUTY), false);
+	BM_mesh_triangulate(bm, (flag & MOD_TRIANGULATE_BEAUTY), false, NULL, NULL);
 
 	result = CDDM_from_bmesh(bm, FALSE);
 	BM_mesh_free(bm);