diff options
| -rw-r--r-- | source/blender/editors/space_image/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_header.c | 91 | ||||
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 3 |
3 files changed, 0 insertions, 95 deletions
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index e3ac30067a5..b23ab624faa 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -37,7 +37,6 @@ set(INC set(SRC image_buttons.c image_draw.c - image_header.c image_ops.c image_render.c space_image.c diff --git a/source/blender/editors/space_image/image_header.c b/source/blender/editors/space_image/image_header.c deleted file mode 100644 index cee532038f4..00000000000 --- a/source/blender/editors/space_image/image_header.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - * $Id$ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2008 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file blender/editors/space_image/image_header.c - * \ingroup spimage - */ - - -#include <string.h> -#include <stdio.h> - -#include "DNA_object_types.h" -#include "DNA_space_types.h" -#include "DNA_windowmanager_types.h" - -#include "BLI_blenlib.h" -#include "BLI_editVert.h" -#include "BLI_utildefines.h" - -#include "BKE_context.h" - -#include "ED_image.h" - -#include "WM_types.h" - -#include "UI_interface.h" -#include "UI_resources.h" - -#include "image_intern.h" - -/********************** toolbox operator *********************/ - -static int toolbox_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED(event)) -{ - SpaceImage *sima= CTX_wm_space_image(C); - Object *obedit= CTX_data_edit_object(C); - uiPopupMenu *pup; - uiLayout *layout; - int show_uvedit; - - show_uvedit= ED_space_image_show_uvedit(sima, obedit); - - pup= uiPupMenuBegin(C, "Toolbox", ICON_NONE); - layout= uiPupMenuLayout(pup); - - uiItemM(layout, C, "IMAGE_MT_view", NULL, ICON_NONE); - if(show_uvedit) uiItemM(layout, C, "IMAGE_MT_select", NULL, ICON_NONE); - uiItemM(layout, C, "IMAGE_MT_image", NULL, ICON_NONE); - if(show_uvedit) uiItemM(layout, C, "IMAGE_MT_uvs", NULL, ICON_NONE); - - uiPupMenuEnd(C, pup); - - return OPERATOR_CANCELLED; -} - -void IMAGE_OT_toolbox(wmOperatorType *ot) -{ - /* identifiers */ - ot->name= "Toolbox"; - ot->idname= "IMAGE_OT_toolbox"; - - /* api callbacks */ - ot->invoke= toolbox_invoke; - ot->poll= space_image_main_area_poll; -} - diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index e923ec5344f..409ab4b2fc6 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -496,7 +496,6 @@ static void image_operatortypes(void) WM_operatortype_append(IMAGE_OT_record_composite); - WM_operatortype_append(IMAGE_OT_toolbox); WM_operatortype_append(IMAGE_OT_properties); WM_operatortype_append(IMAGE_OT_scopes); } @@ -544,8 +543,6 @@ static void image_keymap(struct wmKeyConfig *keyconf) RNA_enum_set(WM_keymap_add_item(keymap, "IMAGE_OT_curves_point_set", ACTIONMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "point", 0); RNA_enum_set(WM_keymap_add_item(keymap, "IMAGE_OT_curves_point_set", ACTIONMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "point", 1); - WM_keymap_add_item(keymap, "IMAGE_OT_toolbox", SPACEKEY, KM_PRESS, 0, 0); - /* toggle editmode is handy to have while UV unwrapping */ kmi= WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", TABKEY, KM_PRESS, 0, 0); RNA_enum_set(kmi->ptr, "mode", OB_MODE_EDIT); |