From 6d79ebebc5dba38225d3817b28e1c189ce8136d5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 30 Nov 2019 18:52:32 +1100 Subject: [PATCH] Cleanup: remove unused NDOF icons --- release/datafiles/blender_icons.svg | 27 ------------------ .../blender_icons16/icon16_ndof_dom.dat | Bin 1048 -> 0 bytes .../blender_icons16/icon16_ndof_fly.dat | Bin 1048 -> 0 bytes .../blender_icons16/icon16_ndof_trans.dat | Bin 1048 -> 0 bytes .../blender_icons16/icon16_ndof_turn.dat | Bin 1048 -> 0 bytes .../blender_icons32/icon32_ndof_dom.dat | Bin 4120 -> 0 bytes .../blender_icons32/icon32_ndof_fly.dat | Bin 4120 -> 0 bytes .../blender_icons32/icon32_ndof_trans.dat | Bin 4120 -> 0 bytes .../blender_icons32/icon32_ndof_turn.dat | Bin 4120 -> 0 bytes .../scripts/startup/bl_ui/space_userpref.py | 4 +-- .../blender/editors/datafiles/CMakeLists.txt | 4 --- source/blender/editors/include/UI_icons.h | 8 +++--- .../editors/space_view3d/view3d_draw.c | 7 ----- 13 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 release/datafiles/blender_icons16/icon16_ndof_dom.dat delete mode 100644 release/datafiles/blender_icons16/icon16_ndof_fly.dat delete mode 100644 release/datafiles/blender_icons16/icon16_ndof_trans.dat delete mode 100644 release/datafiles/blender_icons16/icon16_ndof_turn.dat delete mode 100644 release/datafiles/blender_icons32/icon32_ndof_dom.dat delete mode 100644 release/datafiles/blender_icons32/icon32_ndof_fly.dat delete mode 100644 release/datafiles/blender_icons32/icon32_ndof_trans.dat delete mode 100644 release/datafiles/blender_icons32/icon32_ndof_turn.dat diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index f317b346eb8..6a87ac0adaa 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -1048,9 +1048,6 @@ - - - @@ -1065,9 +1062,6 @@ - - - @@ -1327,14 +1321,6 @@ - - - - - - - - @@ -3746,14 +3732,6 @@ - - - - - - - - @@ -3831,11 +3809,6 @@ - - - - - diff --git a/release/datafiles/blender_icons16/icon16_ndof_dom.dat b/release/datafiles/blender_icons16/icon16_ndof_dom.dat deleted file mode 100644 index e6ecd80d5a9f4a24fe042ef81c146a5eed28e95a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1048 zcmcJNJqp4=5Jp!ah+>gLNU+l*cn&+gfsI`tpjZjoD0n2nd&Jt#fW$XpH%!(=Ei~|$ zzi%e9$;QT*7$z-a9x!bilff^ZvMh5b0_6UDG$|xHALy%RX`T3J2e5^qtLc8LY4lTH z!^vawZNJmm*`fDe^$yApoj;@AIKSK3drzU`Pd+p6Q2kM{5`XH^b@UgQK_BK4OC7s_ zmwk1w)s4}e;b!f~<`ZK1U)2ok5+c9* zdtV?V6OjzJL}W&liqwc}zdzu;@6rBxA())h123F6Ged6(J!*>)R~+H+Mgh%g j?Qp;anziA+?wmE(VM2pE%&AXk@xdKmZwS1wfi%b*N%XK84txN3EsIM4 diff --git a/release/datafiles/blender_icons16/icon16_ndof_turn.dat b/release/datafiles/blender_icons16/icon16_ndof_turn.dat deleted file mode 100644 index 5b0cee02b499f5581bc61459f13da448f0ad17ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1048 zcmeIwtqQ_W6u|K_nN4tr%_Q1=f`QFqwG4)j;4AnT2Js#Iz_w;GSxiPTD24@#VO;;W z9gbmW)eAp%@A?q}IR zh9f5Ep^gx3q}bw&K5YMz&>U60ubq=0;0D|OAk?z;eoefCC-k`MS`ur_@YP>IUlTj* ck)VrEpHVia-rxTa8(i`Bjmq};=RdoF7b~W{pa1{> diff --git a/release/datafiles/blender_icons32/icon32_ndof_dom.dat b/release/datafiles/blender_icons32/icon32_ndof_dom.dat deleted file mode 100644 index 9c7e6fdfc990263cfe4e6a5b60fafd60860c8ea4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4120 zcmeH}Jx;?w5QQz0NJuD9zyWd>gmMD70<;JbNI)10s6f=Y2Z)Y{f)hXq7l0n5G~pYx zV{M#W@7kDDvGg?KouBtSUjKBGB_*H8}{D>U6 z#uyB=uiA+I&iPpN$C2EkuXcXb;j-}M=f9TE`|I`R`{{WMx8(ZxL+i@pv()#2%sd4} z&)*Yq=RGc1ANhE7o!TB4057-Zid8Oq&GtiaJGY7->K}?%;k0W){X=oPR~4WB--biJ z&{GHNO%wZ?3eqa> zC#Mgx?}W{dFZ)YkeV-m;vd=FqT;nTu4FA-Bs#R<6?V0};)kD6%2W(FDZ;3B!uFDd) zc~Z``R(-MFcO0<>*zll`TlGkPpwE!QSK!4Ql{9>T&p*a|*^U?T{5H7&#t2oaSSv=K!uQYaXbU}Gvl z#_uGK#j>jjTHXU6GjsoD_iVEj=UfGDa?ZUkI(N9lArB^Vz#K3K%mH&?4hOvVTQG(< zsLj#(FQweshM>k@hcf6CIuQLfi<(W49^er^U}J{9h`LK?Cu@mafph_dWImk9#c&VO zJ{(MT(^wqpk}EX@&}^xjk}nbODT!K8%&57WRCs^Qn*Tz3=@wQ}`ijIgQ|dt}S)()Y zD!hR7412H&>rjVRkmURKJ=%l5gERtpvIcsmU3dbi57o50LyUYG&LB(2B+|TDCf>+u zB7P3#aL-RGbvf9E6VNk@BT#H1t5-SL0X^do2G9h>`13QF1LlA^U=ElAQwKf)TVSOG diff --git a/release/datafiles/blender_icons32/icon32_ndof_trans.dat b/release/datafiles/blender_icons32/icon32_ndof_trans.dat deleted file mode 100644 index 553752dda4090e451412154c595bab5df469a09b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4120 zcmeH~O-=$q5QRIS3*seM8jQzbsj_10S-gU0V24XX*cnayi5o8gA#q{*J*YA;Oky*c zc4JrasOswO_vqKagnkI25577fe0D>a95FZsC5i*ZfkqC*7zg0daMp;V;U+XM!2)=! zD6SjQC2vEc2X0)nCg0LKNhUmCA-wYY*)(Uf#(@8^Bpd>cKJ-#dRB+$kJIf8#)kS2@-c|Noc&oc0d90X+}8z(ciqnw#eMtceqD z|2?LR?|QM=u4ftbJLnC8&RLBQ8e^b;7g+-h`F#OifS$+lKD%z#LlyGkz#lvC4UhBQ A`~Uy| diff --git a/release/datafiles/blender_icons32/icon32_ndof_turn.dat b/release/datafiles/blender_icons32/icon32_ndof_turn.dat deleted file mode 100644 index 3f43546cdbf7838f3f486d0a0b99b2bde233a9bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4120 zcmeH}J4*vW5XV;&QL*q*34$Jig@_Ok3tK@13m=X60kpTYv$D1jEUZLDF}2@7W56KT z*lOjYv-1&z^Ec})#AEmF1apP#!0%>nc4q#^dPj(?!3# z$g>?nsj;tV(HOI>$s31jlaGIaBUpn;=!Xue#dkvqmS796z}P1XnMqHStK&9J6C+_3 zUUgy^-r-lF-Rx)an`BfM|<7e7i*b(K3#=c-{--ea*LSB@)A%{;tIahfIcc#diVSB@)A-2!~1X|sQx(4!pH zALIXI{w^(B9L-TM@81sV-2bJZxd?KmiOCr-ZF|;c#?YLCdoU*7p-q^90qAU|zVsFi p*Z}iRvixDW{EnemggMxTOOSI!&c|xAXW;w$3HS;43H;Xyd;!|8T7v)p diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index ab4d54f039e..35aa0504cd7 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1456,8 +1456,8 @@ class USERPREF_PT_ndof_settings(Panel): if is_view3d: layout.separator() layout.label(text="Fly/Walk Options") - layout.prop(input_prefs, "ndof_fly_helicopter", icon='NDOF_FLY') - layout.prop(input_prefs, "ndof_lock_horizon", icon='NDOF_DOM') + layout.prop(input_prefs, "ndof_fly_helicopter") + layout.prop(input_prefs, "ndof_lock_horizon") class USERPREF_PT_input_keyboard(PreferencePanel, Panel): 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); }