[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51821] trunk/blender/source/blender/ editors/uvedit/uvedit_unwrap_ops.c: UV editor: change unwrap warning about object non-unit size to only warning about

[Brecht Van Lommel]

Revision: 51821
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51821
Author:   blendix
Date:     2012-11-02 13:36:10 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------
UV editor: change unwrap warning about object non-unit size to only warning about
non-uniform scale, otherwise it gives warnings for cases when it's not needed.

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

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2012-11-02 12:47:32 UTC (rev 51820)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2012-11-02 13:36:10 UTC (rev 51821)
@@ -1171,7 +1171,7 @@
 	int correct_aspect = RNA_boolean_get(op->ptr, "correct_aspect");
 	int use_subsurf = RNA_boolean_get(op->ptr, "use_subsurf_data");
 	int subsurf_level = RNA_int_get(op->ptr, "uv_subsurf_level");
-	float obsize[3], unitsize[3] = {1.0f, 1.0f, 1.0f};
+	float obsize[3];
 	short implicit = 0;
 
 	if (!uvedit_have_selection(scene, em, implicit)) {
@@ -1184,9 +1184,9 @@
 	}
 
 	mat4_to_size(obsize, obedit->obmat);
-	if (!compare_v3v3(obsize, unitsize, 1e-4f))
+	if (!(fabsf(obsize[0] - obsize[1]) < 1e-4f && fabsf(obsize[1] - obsize[2]) < 1e-4f))
 		BKE_report(op->reports, RPT_INFO,
-		           "Object scale is not 1.0, unwrap will operate on a non-scaled version of the mesh");
+		           "Object has non-uniform scale, unwrap will operate on a non-scaled version of the mesh");
 
 	/* remember last method for live unwrap */
 	if (RNA_struct_property_is_set(op->ptr, "method"))