-> Further work to improve triangle conversion tool:

The improved triangle to quad conversion is now better integrated
into Blender in several respects. First of all the code makes distinctions
between 'simple' pairs and 'complex' pairs. Simple pairs are an island of
exactly two selected triangles that are joined by an edge. These simple pairs
are subject to the old 2.42 rules for joining triangles. Complex pairs are part
of larger islands of selected triangles and their conversion is controlled by
several parameters that can be individually tweaked via new buttons located
in the "Mesh Tools" panel of the editing buttons. Furthermore the tool deals
with any arbitrary combination of simple and complex islands in a consistent and
logcial way.

The code has also been drasitcally cleaned up and should address the open
bugs in the tracker regarding alt-j. However as part of cleanup the tool has
been made somewhat slower to insure a consistent mesh structure. This is a
limitation of the exist_face() function in editmesh and will have to be adressed
at a later date.

1 files changed, 4 insertions, 0 deletions

diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h
index aaad17453ef..33d3d7fa4c6 100644
--- a/source/blender/include/blendef.h
+++ b/source/blender/include/blendef.h
@@ -417,6 +417,10 @@
 #define B_KNIFE			0x80
 #define B_PERCENTSUBD	0x40
 #define B_MESH_X_MIRROR	0x100
+#define B_JOINTRIA_UV 0x200
+#define B_JOINTRIA_VCOL 0X400
+#define B_JOINTRIA_SHARP 0X800
+#define B_JOINTRIA_MAT 0X1000
 
 /* DISPLAYMODE */
 #define R_DISPLAYIMAGE	0