[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56939] trunk/blender/source/blender/ editors/uvedit: Related to #35452: show warning when unwrapping object with negative scale, same

[Brecht Van Lommel]

Revision: 56939
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56939
Author:   blendix
Date:     2013-05-21 10:13:44 +0000 (Tue, 21 May 2013)
Log Message:
-----------
Related to #35452: show warning when unwrapping object with negative scale, same
as we already do for non-uniform scale.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
    trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c	2013-05-21 10:13:42 UTC (rev 56938)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c	2013-05-21 10:13:44 UTC (rev 56939)
@@ -250,7 +250,7 @@
 };
 
 #define PHASH_hash(ph, item) (((uintptr_t) (item)) % ((unsigned int) (ph)->cursize))
-#define PHASH_edge(v1, v2)   ((v1) ^ (v2))
+#define PHASH_edge(v1, v2)   (((v1) < (v2)) ? ((v1) * 39) ^ ((v2) * 31) : ((v1) * 31) ^ ((v2) * 39))
 
 static PHash *phash_new(PHashLink **list, int sizehint)
 {

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2013-05-21 10:13:42 UTC (rev 56938)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2013-05-21 10:13:44 UTC (rev 56939)
@@ -1184,6 +1184,9 @@
 	if (!(fabsf(obsize[0] - obsize[1]) < 1e-4f && fabsf(obsize[1] - obsize[2]) < 1e-4f))
 		BKE_report(op->reports, RPT_INFO,
 		           "Object has non-uniform scale, unwrap will operate on a non-scaled version of the mesh");
+	else if (is_negative_m4(obedit->obmat))
+		BKE_report(op->reports, RPT_INFO,
+		           "Object has negative scale, unwrap will operate on a non-flipped version of the mesh");
 
 	/* remember last method for live unwrap */
 	if (RNA_struct_property_is_set(op->ptr, "method"))