diff options
| author | Ton Roosendaal <ton@blender.org> | 2007-02-09 15:26:25 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2007-02-09 15:26:25 +0300 |
| commit | a61e2dce428d7fe9691dcd9207b2379d63134283 (patch) | |
| tree | a95f97da7747e31bf21d825fd523f3feebe43f66 | |
| parent | d814f0161035865effaa8407222f3941197319dc (diff) | |
Bugfix #5909
UV Image editor: the Nkey panel did now show the buttons for UV values
anymore (was moved to "game properties", incorrect).
| -rw-r--r-- | source/blender/src/buttons_shading.c | 3 | ||||
| -rw-r--r-- | source/blender/src/drawimage.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 0cba9846196..514c54a1759 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -1148,6 +1148,9 @@ void uiblock_image_panel(uiBlock *block, Image **ima_pp, ImageUser *iuser, uiDefBut(block, LABEL, 0, str, 10, 107, 300, 20, NULL, 1, 0, 0, 0, ""); } + /* exception, let's do because we only use this panel 3 times in blender... but not real good code! */ + if( (G.f & G_FACESELECT) && G.sima && &G.sima->iuser==iuser) + return; /* left side default per-image options, right half the additional options */ /* fields */ diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c index 257d78c8b95..de80f5513a1 100644 --- a/source/blender/src/drawimage.c +++ b/source/blender/src/drawimage.c @@ -913,8 +913,10 @@ static void image_panel_properties(short cntrl) // IMAGE_HANDLER_PROPERTIES if(uiNewPanel(curarea, block, "Properties", "Image", 10, 10, 318, 204)==0) return; + /* note, it draws no bottom half in facemode, for vertex buttons */ uiblock_image_panel(block, &G.sima->image, &G.sima->iuser, B_REDR, B_REDR); + image_editvertex_buts(block); } static void image_panel_game_properties(short cntrl) // IMAGE_HANDLER_GAME_PROPERTIES @@ -947,8 +949,6 @@ static void image_panel_game_properties(short cntrl) // IMAGE_HANDLER_GAME_PROPE uiDefButS(block, NUM, B_SIMAGEDRAW, "Y:", 230,130,70,19, &G.sima->image->yrep, 1.0, 16.0, 0, 0, "Sets the degree of repetition in the Y direction"); uiBlockBeginAlign(block); } - - image_editvertex_buts(block); } static void image_panel_paint(short cntrl) // IMAGE_HANDLER_PAINT |