fix for some button overlap problems

diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index e3bb782aceff0a3004babf58e2b528b4fdc5b0c7..e5026f6f64ea8e9708a4afd8ccfca5cfe1fd8ec3 100644 (file)
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -1208,7 +1208,7 @@ void uiblock_image_panel(uiBlock *block, Image **ima_pp, ImageUser *iuser,
                         uiBlockSetFunc(block, NULL, NULL, NULL);
                 }
         }
-
+        uiBlockEndAlign(block);
 }      
 
 static void texture_panel_image(Image **ima, ImageUser *iuser)

diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c
index 4aa3543493ab0f527c223638e28bc3a8fe1f24ee..3ee30991639be5385ecf2a54782f01b94e89b1ca 100644 (file)
--- a/source/blender/src/header_image.c
+++ b/source/blender/src/header_image.c
@@ -1174,13 +1174,16 @@ void image_buttons(void)
                xco+= XIC + 18;
                
                uiBlockBeginAlign(block);
-               uiDefIconButBitI(block, TOG, SI_SYNC_UVSEL, B_REDR, ICON_MESH_HLT, xco,0,XIC,YIC, &G.sima->flag, 0, 0, 0, 0, "Sync Mesh Selection");
+               uiDefIconButBitI(block, TOG, SI_SYNC_UVSEL, B_REDR, ICON_MESH_HLT, xco,0,XIC,YIC, &G.sima->flag, 0, 0, 0, 0, "Sync Mesh Selection (vert & face selection mode override sticky)");
+               xco+= XIC;
                if ((G.sima->flag & SI_SYNC_UVSEL)==0) {
-                       xco+= XIC;
                        ubut = uiDefIconTextButC(block, ICONTEXTROW, B_REDR, ICON_STICKY_UVS_LOC,
                                        "Sticky UV Selection: %t|Disable%x1|Shared Location%x0|Shared Vertex%x2",
                                        xco,0,XIC+10,YIC, &(G.sima->sticky), 0, 3.0, 0, 0,
                                        "Sticky UV Selection (Hotkeys: Shift C, Alt C, Ctrl C)");
+                       xco+= XIC + 16;
+               } else {
+                       xco+= 6;
                }
                uiBlockEndAlign(block);
                
@@ -1197,15 +1200,11 @@ void image_buttons(void)
                        str_pt = str_menu;
                        str_pt[0]='\0';
                        mesh_layers_menu_concat(&G.editMesh->fdata, CD_MTFACE, str_pt);
-                       xco+= XIC+8;
                        ubut = uiDefButI(block, MENU, B_NOP, str_menu ,xco,0,115,YIC, &act, 0, 0, 0, 0, "Active UV Layer for editing");
                        uiButSetFunc(ubut, do_image_buttons_set_uvlayer_callback, &act, NULL);
                        
                        /*MEM_freeN(str);*/
-                       xco+= 80;
-                       
-               } else {
-                       xco+= XIC+16;
+                       xco+= 120;
                }
        }