[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51349] trunk/blender/source/blender: Fix for #32852: set uv unwrap default packing marging to 0.001.

[Brecht Van Lommel]

Revision: 51349
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51349
Author:   blendix
Date:     2012-10-15 17:56:51 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Fix for #32852: set uv unwrap default packing marging to 0.001.

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

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c      2012-10-15 
17:56:40 UTC (rev 51348)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c      2012-10-15 
17:56:51 UTC (rev 51349)
@@ -446,6 +446,7 @@
        sce->toolsettings->uvcalc_cubesize = 1.0f;
        sce->toolsettings->uvcalc_mapdir = 1;
        sce->toolsettings->uvcalc_mapalign = 1;
+       sce->toolsettings->uvcalc_margin = 0.001f;
        sce->toolsettings->unwrapper = 1;
        sce->toolsettings->select_thresh = 0.01f;
        sce->toolsettings->jointrilimit = 0.8f;

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c     
2012-10-15 17:56:40 UTC (rev 51348)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c     
2012-10-15 17:56:51 UTC (rev 51349)
@@ -729,12 +729,10 @@
                return OPERATOR_CANCELLED;
        }
 
-       if (RNA_struct_property_is_set(op->ptr, "margin")) {
+       if (RNA_struct_property_is_set(op->ptr, "margin"))
                scene->toolsettings->uvcalc_margin = RNA_float_get(op->ptr, 
"margin");
-       }
-       else {
+       else
                RNA_float_set(op->ptr, "margin", 
scene->toolsettings->uvcalc_margin);
-       }
 
        handle = construct_param_handle(scene, em, implicit, 0, 1, 1);
        param_pack(handle, scene->toolsettings->uvcalc_margin);
@@ -761,7 +759,7 @@
        ot->poll = ED_operator_uvedit;
 
        /* properties */
-       RNA_def_float_factor(ot->srna, "margin", 0.0f, 0.0f, 1.0f, "Margin", 
"Space between islands", 0.0f, 1.0f);
+       RNA_def_float_factor(ot->srna, "margin", 0.001f, 0.0f, 1.0f, "Margin", 
"Space between islands", 0.0f, 1.0f);
 }
 
 /* ******************** Average Islands Scale operator **************** */
@@ -1194,6 +1192,12 @@
        else
                RNA_enum_set(op->ptr, "method", scene->toolsettings->unwrapper);
 
+       /* remember packing marging */
+       if (RNA_struct_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);
+
        scene->toolsettings->uv_subsurf_level = subsurf_level;
 
        if (fill_holes) scene->toolsettings->uvcalc_flag |=  UVCALC_FILLHOLES;
@@ -1241,8 +1245,9 @@
                        "Map UVs taking image aspect ratio into account");
        RNA_def_boolean(ot->srna, "use_subsurf_data", 0, "Use Subsurf Data",
                        "Map UVs taking vertex position after subsurf into 
account");
-       RNA_def_int(ot->srna, "uv_subsurf_level", 1, 1, 6, "SubSurf Target",
+       RNA_def_int(ot->srna, "uv_subsurf_level", 1, 1, 6, "Subsurf Target",
                    "Number of times to subdivide before calculating UVs", 1, 
6);
+       RNA_def_float_factor(ot->srna, "margin", 0.001f, 0.0f, 1.0f, "Margin", 
"Space between islands", 0.0f, 1.0f);
 }
 
 /**************** Project From View operator **************/

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs