diff options
| author | Ines Almeida <britalmeida@gmail.com> | 2018-10-13 20:49:26 +0300 |
|---|---|---|
| committer | Ines Almeida <britalmeida@gmail.com> | 2018-10-13 20:49:26 +0300 |
| commit | ab62b7e971ab446c8c286fac305a846f83161e50 (patch) | |
| tree | 7fd5a67b9653e2e10efee94374e812e76da86a05 /source/blender/editors/space_buttons/buttons_texture.c | |
| parent | cc8424e73324b772621045c1856f9a8869faa859 (diff) | |
| parent | dd6bf3f84a9137affbcd8ba0fc957c32b8c0aff7 (diff) | |
Merge branch 'origin/blender2.8' into temp-ui-layout-2.8temp-ui-layout-2.8
Diffstat (limited to 'source/blender/editors/space_buttons/buttons_texture.c')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_texture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index de422565abd..958b55526c3 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -507,7 +507,7 @@ void uiTemplateTextureShow(uiLayout *layout, bContext *C, PointerRNA *ptr, Prope uiBlock *block = uiLayoutGetBlock(layout); uiBut *but; - but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_BUTS, 0, 0, UI_UNIT_X, UI_UNIT_Y, + but = uiDefIconBut(block, UI_BTYPE_BUT, 0, ICON_PROPERTIES, 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Show texture in texture tab")); UI_but_func_set(but, template_texture_show, user->ptr.data, user->prop); } |