Revision: 36042
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36042
Author: campbellbarton
Date: 2011-04-07 08:54:43 +0000 (Thu, 07 Apr 2011)
Log Message:
-----------
add margin access [#26806] Missing pack margin for pack islands in UV editor
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
2011-04-07 08:23:00 UTC (rev 36041)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
2011-04-07 08:54:43 UTC (rev 36042)
@@ -431,13 +431,20 @@
/* ******************** Pack Islands operator **************** */
-static int pack_islands_exec(bContext *C, wmOperator *UNUSED(op))
+static int pack_islands_exec(bContext *C, wmOperator *op)
{
Scene *scene= CTX_data_scene(C);
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
ParamHandle *handle;
+ 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);
+ }
+
handle = construct_param_handle(scene, em, 1, 0, 1, 1);
param_pack(handle, scene->toolsettings->uvcalc_margin);
param_flush(handle);
@@ -460,6 +467,9 @@
/* api callbacks */
ot->exec= pack_islands_exec;
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);
}
/* ******************** Average Islands Scale operator **************** */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
