diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-09-10 16:26:36 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-09-10 16:26:36 +0400 |
| commit | e8a808da24e0c791a557aae7e3930550982f45c7 (patch) | |
| tree | 804b01e82ee92e2081aa5aa5b56105342e021fdb /source/blender/src/header_image.c | |
| parent | 0e3460dd1b6b9521f1833998b63d7753639c5339 (diff) | |
UV Editing is now done in editmode rather then UV/Face Select mode.
Notes
* you cant edit UV's in the image window in "UV Face Select" mode. (removed UV from the name)
* going into Face Select mode no longer adds UV's and does not need UV's to work.
* The UV Calculation menu is now in editmode (Alt+W)
Todo..
* Image replace - partly broken in stable also.
* Rotate/Mirror UV/VCol are still only in Face Select mode.
* Hide/Reveal is not quite right, (issue with editmode flushing)
Diffstat (limited to 'source/blender/src/header_image.c')
| -rw-r--r-- | source/blender/src/header_image.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index d6878d70165..649ce1438f9 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -72,6 +72,7 @@ #include "BIF_space.h" #include "BIF_transform.h" #include "BIF_toolbox.h" +#include "BIF_editmesh.h" #include "BSE_drawview.h" #include "BSE_filesel.h" @@ -137,7 +138,7 @@ void do_image_buttons(unsigned short event) break; case B_SIMAGEDRAW: - if(G.f & G_FACESELECT) { + if (EM_texFaceCheck()) { make_repbind(G.sima->image); image_changed(G.sima, 1); } @@ -1132,7 +1133,7 @@ void image_buttons(void) uiDefPulldownBut(block, image_viewmenu, NULL, "View", xco, -2, xmax-3, 24, ""); xco+= xmax; - if((G.f & G_FACESELECT) && !(ima && (G.sima->flag & SI_DRAWTOOL))) { + if((EM_texFaceCheck()) && !(ima && (G.sima->flag & SI_DRAWTOOL))) { xmax= GetButStringLength("Select"); uiDefPulldownBut(block, image_selectmenu, NULL, "Select", xco, -2, xmax-3, 24, ""); xco+= xmax; @@ -1145,8 +1146,7 @@ void image_buttons(void) xmax= GetButStringLength(menuname); uiDefPulldownBut(block, image_imagemenu, NULL, menuname, xco, -2, xmax-3, 24, ""); xco+= xmax; - - if((G.f & G_FACESELECT) && !(ima && (G.sima->flag & SI_DRAWTOOL))) { + if((EM_texFaceCheck()) && !(ima && (G.sima->flag & SI_DRAWTOOL))) { xmax= GetButStringLength("UVs"); uiDefPulldownBut(block, image_uvsmenu, NULL, "UVs", xco, -2, xmax-3, 24, ""); xco+= xmax; |