From 6d79ebebc5dba38225d3817b28e1c189ce8136d5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 30 Nov 2019 18:52:32 +1100 Subject: Cleanup: remove unused NDOF icons --- source/blender/editors/datafiles/CMakeLists.txt | 4 ---- source/blender/editors/include/UI_icons.h | 8 ++++---- source/blender/editors/space_view3d/view3d_draw.c | 7 ------- 3 files changed, 4 insertions(+), 15 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 680fe3a00e5..fd8fe103a2d 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -529,10 +529,6 @@ set(ICON_NAMES axis_side axis_front axis_top - ndof_dom - ndof_turn - ndof_fly - ndof_trans layer_used layer_active sortalpha diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index c15f299bca8..2bf50d3b4b8 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -739,10 +739,10 @@ DEF_ICON_BLANK(251) DEF_ICON(AXIS_SIDE) DEF_ICON(AXIS_FRONT) DEF_ICON(AXIS_TOP) -DEF_ICON(NDOF_DOM) -DEF_ICON(NDOF_TURN) -DEF_ICON(NDOF_FLY) -DEF_ICON(NDOF_TRANS) +DEF_ICON_BLANK(252) +DEF_ICON_BLANK(252a) +DEF_ICON_BLANK(252b) +DEF_ICON_BLANK(252c) DEF_ICON(LAYER_USED) DEF_ICON(LAYER_ACTIVE) /* available */ diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 831f8d77285..5f029e840d3 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1121,13 +1121,6 @@ static void draw_rotation_guide(const RegionView3D *rv3d) immEnd(); immUnbindProgram(); -# if 0 - /* find screen coordinates for rotation center, then draw pretty icon */ - mul_m4_v3(rv3d->persinv, rot_center); - UI_icon_draw(rot_center[0], rot_center[1], ICON_NDOF_TURN); - /* ^^ just playing around, does not work */ -# endif - GPU_blend(false); glDepthMask(GL_TRUE); } -- cgit v1.2.3