[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49471] branches/soc-2012-bratwurst/source /blender/editors/uvedit: Add gui options for isomap

[Antony Riakiotakis]

Revision: 49471
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49471
Author:   psy-fi
Date:     2012-08-01 17:54:00 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
Add gui options for isomap

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_unwrap_ops.c

Modified: branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_parametrizer.h
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_parametrizer.h	2012-08-01 17:52:14 UTC (rev 49470)
+++ branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_parametrizer.h	2012-08-01 17:54:00 UTC (rev 49471)
@@ -81,6 +81,12 @@
  *   quick re-solving
  */
 
+
+enum UnwrapMethods {
+	UNWRAP_ABF,
+	UNWRAP_LSCM,
+	UNWRAP_ISOMAP
+	};
 void param_lscm_begin(ParamHandle *handle, ParamBool live, ParamBool abf);
 void param_lscm_solve(ParamHandle *handle);
 void param_lscm_end(ParamHandle *handle);

Modified: branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2012-08-01 17:52:14 UTC (rev 49470)
+++ branches/soc-2012-bratwurst/source/blender/editors/uvedit/uvedit_unwrap_ops.c	2012-08-01 17:54:00 UTC (rev 49471)
@@ -1362,7 +1362,7 @@
 	else
 		handle = construct_param_handle(scene, obedit, 0, fill_holes, sel, correct_aspect, use_mirror);
 
-	param_lscm_begin(handle, PARAM_FALSE, scene->toolsettings->unwrapper == 0);
+	param_lscm_begin(handle, PARAM_FALSE, scene->toolsettings->unwrapper == UNWRAP_ABF);
 	param_lscm_solve(handle);
 	param_lscm_end(handle);
 
@@ -1439,8 +1439,9 @@
 void UV_OT_unwrap(wmOperatorType *ot)
 {
 	static EnumPropertyItem method_items[] = {
-		{0, "ANGLE_BASED", 0, "Angle Based", ""},
-		{1, "CONFORMAL", 0, "Conformal", ""},
+		{UNWRAP_ABF, "ANGLE_BASED", 0, "Angle Based", ""},
+		{UNWRAP_LSCM, "CONFORMAL", 0, "Conformal", ""},
+		{UNWRAP_ISOMAP, "ISOMAP", 0, "Isomap", ""},
 		{0, NULL, 0, NULL, NULL}
 	};
 
@@ -1456,7 +1457,7 @@
 
 	/* properties */
 	RNA_def_enum(ot->srna, "method", method_items, 0, "Method",
-	             "Unwrapping method (Angle Based usually gives better results than Conformal, while being somewhat slower)");
+	             "Unwrapping method (Angle Based usually gives better results than Conformal, while being somewhat slower. Isomap is best)");
 	RNA_def_boolean(ot->srna, "fill_holes", 1, "Fill Holes",
 	                "Virtual fill holes in mesh before unwrapping, to better avoid overlaps and preserve symmetry");
 	RNA_def_boolean(ot->srna, "correct_aspect", 1, "Correct Aspect",