[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39119] branches/soc-2011-avocado/blender/ source/blender/editors/mesh/autoseam_tools.c: Integration of Island margin preservation functionality with autoseam.

[shuvro sarker]

Revision: 39119
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39119
Author:   shuvro
Date:     2011-08-07 05:24:58 +0000 (Sun, 07 Aug 2011)
Log Message:
-----------
Integration of Island margin preservation functionality with autoseam.

Modified Paths:
--------------
    branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c

Modified: branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c
===================================================================
--- branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c	2011-08-07 04:57:23 UTC (rev 39118)
+++ branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c	2011-08-07 05:24:58 UTC (rev 39119)
@@ -62,6 +62,8 @@
 #include "WM_api.h"
 #include "autoseam_C_API.h"
 
+
+
 //#include "carpack.h"
 //#include "f2c.h"
 //#include "dssimp.c"
@@ -597,6 +599,14 @@
 	if(correct_aspect)	scene->toolsettings->uvcalc_flag &= ~UVCALC_NO_ASPECT_CORRECT;
 	else				scene->toolsettings->uvcalc_flag |=  UVCALC_NO_ASPECT_CORRECT;
 	
+	/* This portion handles pack islands feature. */
+	if(RNA_property_is_set(op->ptr, "margin")) {
+		scene->toolsettings->uvcalc_margin= RNA_float_get(op->ptr, "margin");
+	}
+	else {
+		RNA_float_set(op->ptr, "margin", scene->toolsettings->uvcalc_margin);
+	}
+
 	ED_unwrap_lscm(scene, obedit, TRUE);
 	
 	/*reset the min_value*/
@@ -635,6 +645,8 @@
 	RNA_def_enum(ot->srna, "method", method_items, 0, "Method", "Unwrapping method. Angle Based usually gives better results than Conformal, while being somewhat slower.");
 	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", "Map UV's taking image aspect ratio into account.");
+	RNA_def_float_factor(ot->srna, "margin", 0.0f, 0.0f, 1.0f, "Margin", "Space between islands", 0.0f, 1.0f);
+
 	
 }