[Bf-blender-cvs] [5474dfe] master: Correct hard-coded height for UV-Vertex buttons
Campbell Barton
noreply at git.blender.org
Thu Jun 5 08:03:54 CEST 2014
Commit: 5474dfe70168be6918054964663ac7f815372042
Author: Campbell Barton
Date: Thu Jun 5 15:00:26 2014 +1000
https://developer.blender.org/rB5474dfe70168be6918054964663ac7f815372042
Correct hard-coded height for UV-Vertex buttons
===================================================================
M source/blender/editors/space_view3d/view3d_buttons.c
M source/blender/editors/uvedit/uvedit_buttons.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index dfbae90..a4d0b80 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -450,7 +450,6 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
}
uiBlockEndAlign(block);
- uiBlockEndAlign(block);
}
else { /* apply */
diff --git a/source/blender/editors/uvedit/uvedit_buttons.c b/source/blender/editors/uvedit/uvedit_buttons.c
index 78e3811..6816e78 100644
--- a/source/blender/editors/uvedit/uvedit_buttons.c
+++ b/source/blender/editors/uvedit/uvedit_buttons.c
@@ -135,6 +135,7 @@ static void uvedit_vertex_buttons(const bContext *C, uiBlock *block)
BMEditMesh *em;
float center[2];
int imx, imy, step, digits;
+ float width = 8 * UI_UNIT_X;
ED_space_image_get_size(sima, &imx, &imy);
@@ -158,9 +159,9 @@ static void uvedit_vertex_buttons(const bContext *C, uiBlock *block)
}
uiBlockBeginAlign(block);
- uiDefButF(block, NUM, B_UVEDIT_VERTEX, IFACE_("X:"), 10, 10, 145, 19, &uvedit_old_center[0],
+ uiDefButF(block, NUM, B_UVEDIT_VERTEX, IFACE_("X:"), 0, 0, width, UI_UNIT_Y, &uvedit_old_center[0],
-10 * imx, 10.0 * imx, step, digits, "");
- uiDefButF(block, NUM, B_UVEDIT_VERTEX, IFACE_("Y:"), 165, 10, 145, 19, &uvedit_old_center[1],
+ uiDefButF(block, NUM, B_UVEDIT_VERTEX, IFACE_("Y:"), width, 0, width, UI_UNIT_Y, &uvedit_old_center[1],
-10 * imy, 10.0 * imy, step, digits, "");
uiBlockEndAlign(block);
}
More information about the Bf-blender-cvs
mailing list