From ba35761d331e89dbe6650b10d7a22ebe4636daa8 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 25 Aug 2014 12:45:49 +0200 Subject: [PATCH] SplitNormals UI tweaks: add own color for normals drawing, and own 'face corner' icon. --- release/datafiles/blender_icons.svg | 215 +++++++++++++++++- .../blender_icons16/icon16_ipo_bounce.dat | Bin 1048 -> 1048 bytes .../blender_icons16/icon16_ipo_elastic.dat | Bin 1048 -> 1048 bytes .../blender_icons16/icon16_loopsel.dat | Bin 0 -> 1048 bytes .../blender_icons32/icon32_loopsel.dat | Bin 0 -> 4120 bytes .../blender_icons32/icon32_nla_pushdown.dat | Bin 4120 -> 4120 bytes release/scripts/startup/bl_ui/space_view3d.py | 2 +- source/blender/editors/include/UI_icons.h | 2 +- source/blender/editors/include/UI_resources.h | 1 + source/blender/editors/interface/resources.c | 13 ++ .../blender/editors/space_view3d/drawobject.c | 2 +- source/blender/makesdna/DNA_userdef_types.h | 3 +- source/blender/makesrna/intern/rna_userdef.c | 6 + 13 files changed, 239 insertions(+), 5 deletions(-) create mode 100644 release/datafiles/blender_icons16/icon16_loopsel.dat create mode 100644 release/datafiles/blender_icons32/icon32_loopsel.dat diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg index 7557b81c804..4a1e2cd1d9a 100644 --- a/release/datafiles/blender_icons.svg +++ b/release/datafiles/blender_icons.svg @@ -14,7 +14,7 @@ height="640" id="svg2" sodipodi:version="0.32" - inkscape:version="0.48.4 r" + inkscape:version="0.48.5 r10040" version="1.0" sodipodi:docname="blender_icons.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" @@ -26,6 +26,17 @@ id="title49470">Blender icons v. 2.5.08 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + K&DxA_nE)dD1fl={ diff --git a/release/datafiles/blender_icons16/icon16_ipo_elastic.dat b/release/datafiles/blender_icons16/icon16_ipo_elastic.dat index 5db0f97491224516a74ea797ef9f71217a747d7f..221b0a2223608d8b914a4db9c43e947d270f4179 100644 GIT binary patch delta 15 XcmbQiF@s~nMn4C#l*nS0L1_Q|Hq4g%2^1h!6t7h#h~G&#Bjw$nc*eSj8Guv z!KMyf%uJd=*in(;fV(Qg-#|nDw~;2ipPZeYr*d#`v;xg=1!6XIJs>{N0ydz&l^$x0 zze7#7 zLh7y0_qQB+d2`dQqkC7ZiZ$o|7#SHkH8(f62V_Qec6N`lvT_ele>t*#Hx-8ee;#i+ z{rTqNi|?;3xcKzanw@73F5eJqA@B*LKP@e-2ZZzU^LuJ)YC!sX(DnbjyXf|}OH=QE zx;*RZvkR+sT|BsWTO68xkQt4Qjac>nzcS^;kF(vc-k+U)?#20~2d*4hxHH~T5XF9w z{?5)$?E25NefoZ){l$kf(=WWfu<*#$!wYuDTVd*-Fku3Qeh;AkUvJ9&`Ta!Oqfe(N zU%9xc zadqOeXU}@j@!q|Ad$w)chN1r#lK#WHH_t-X2jbtnd9!Eg)TupIR#qLr_=|wWAK3lc z41a+1Ur$wrCCtpsX>M+A-78nF?74I2PS1)JD|-C>{kuWpKz&9)%nH*Bqa)NAq=0^r VgYkiC_<-0Rh*P07A54y#Gyvp(J(U0e literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_loopsel.dat b/release/datafiles/blender_icons32/icon32_loopsel.dat new file mode 100644 index 0000000000000000000000000000000000000000..11d3e9d284e9534357627b80c26f2a657667d382 GIT binary patch literal 4120 zcmds)3rtg29L5hm!Wc2UTqJH9C#cDE8&0E4&=B#J7|kXaMHB%EGU8(oF$O_EWC%Sv zU=%da%FFT)9YO_H!OEjNN-2HtkcXodEQIm6&=wdSy*sDNH4SN{nz3YS^5vd;dT)Q< zch3Kud%Fq%unOrqQrJQO*o#nOF#se<{-=dfypQ#7=RnLwt}8+2ZbvY+Yc&`_=We)f zzI`Bunez&84RI&-I06!D-x{Dn{fS6XNSpCB^WkIb3gExn0gO=Gy=%;7zW&sF!fW#q zV(r?sbi~DiNZ%u^`=>l?TnTo$JAht2uJ+U($KEIG{G1ccHe<)PS`(3xk#uiwZ~F4( z%Q2tQY1IDkU449R57zHo4O$Rat7ES*BmLc14mDTiu-k>4d;GfcJ3h|VI(|e%1RV>a z&ygcXpp}&s<$;Dg97D1-)yGDA@PXUMplYupn4vQJ>{zC%E~4>N{k)Q~zM6-kx}riZ zr!X7w$Gx{$5jgv~bLZ#@2?;PhJ|3d+fbQ<@(A?ad@`0EB0i-vs6;xX(h^e8tN4Ho{ zl`=x4ll|ot6R$WGgsiMw(Oz6u%grmOdXmqg_+DOKbgbauU>!RyE)K@T#K4e{5V&d6 zCb(e10?J1;^5AA{EU3(foGdiiaVNW{6_2Z@d&_w0o}${3_Itd+w)|?jw79r|oBM!Q zkyqgJrL_|0r}%+^fe`EL*|YG@?bl*f>T#u6f)AP|r zy7*;Pq98NUv-8ZJ6@#Y>(&{U%Y}SCU-y2Y_wI|Y!Pnw@-s-== ziO+zg#|Cg5$^R=SV6E>Fx6udvYXlpS0+8a7sGPWs`|x**XWus;=ZLce3D2j&Ih_yY I|Lr&b0+E4XLjV8( literal 0 HcmV?d00001 diff --git a/release/datafiles/blender_icons32/icon32_nla_pushdown.dat b/release/datafiles/blender_icons32/icon32_nla_pushdown.dat index 83216ac536716605dd7bd52b0e4ec0b9f38da92e..3a0e1c73a5211a388c8da60fa32dfe0b8bb69db2 100644 GIT binary patch delta 29 lcmbQCFhgO(7FOolw{LIW&g#R-dWV65L4Trx%48k>HvqAN3ef-n delta 29 lcmbQCFhgO(7FOn4w{C6T&g#R-dYgfPL4Trx%48k>Hvq9a3e5lj diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index b7486990f74..0a90034e9b9 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -2946,7 +2946,7 @@ class VIEW3D_PT_view3d_meshdisplay(Panel): row = col.row(align=True) row.prop(mesh, "show_normal_vertex", text="", icon='VERTEXSEL') - row.prop(mesh, "show_normal_loop", text="", icon='VERTEXSEL') + row.prop(mesh, "show_normal_loop", text="", icon='LOOPSEL') row.prop(mesh, "show_normal_face", text="", icon='FACESEL') sub = row.row(align=True) diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index e06b8e62f27..1d79cf749f9 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -668,8 +668,8 @@ DEF_ICON(IPO_EASE_IN_OUT) DEF_ICON(VERTEXSEL) DEF_ICON(EDGESEL) DEF_ICON(FACESEL) +DEF_ICON(LOOPSEL) #ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK209) DEF_ICON(BLANK210) #endif DEF_ICON(ROTATE) diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index da365355e95..872bd32b75b 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -106,6 +106,7 @@ enum { TH_FACE_SELECT, TH_NORMAL, TH_VNORMAL, + TH_LNORMAL, TH_FACE_DOT, TH_FACEDOT_SIZE, TH_CFRAME, diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 822fa41e69d..c2b234df3bf 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -335,6 +335,8 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo cp = ts->normal; break; case TH_VNORMAL: cp = ts->vertex_normal; break; + case TH_LNORMAL: + cp = ts->loop_normal; break; case TH_BONE_SOLID: cp = ts->bone_solid; break; case TH_BONE_POSE: @@ -866,6 +868,7 @@ void ui_theme_init_default(void) rgba_char_args_set(btheme->tv3d.face_select, 255, 133, 0, 60); rgba_char_args_set(btheme->tv3d.normal, 0x22, 0xDD, 0xDD, 255); rgba_char_args_set(btheme->tv3d.vertex_normal, 0x23, 0x61, 0xDD, 255); + rgba_char_args_set(btheme->tv3d.loop_normal, 0xDD, 0x23, 0xDD, 255); rgba_char_args_set(btheme->tv3d.face_dot, 255, 133, 0, 255); rgba_char_args_set(btheme->tv3d.editmesh_active, 255, 255, 255, 128); rgba_char_args_set_fl(btheme->tv3d.edge_crease, 0.8, 0, 0.6, 1.0); @@ -2479,6 +2482,16 @@ void init_userdef_do_versions(void) } } + { + bTheme *btheme; + for (btheme = U.themes.first; btheme; btheme = btheme->next) { + /* check for (alpha == 0) is safe, then color was never set */ + if (btheme->tv3d.loop_normal[3] == 0) { + rgba_char_args_set(btheme->tv3d.loop_normal, 0xDD, 0x23, 0xDD, 255); + } + } + } + if (U.pixelsize == 0.0f) U.pixelsize = 1.0f; diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 135aeb95c92..1f05d3566b5 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3611,7 +3611,7 @@ static void draw_em_fancy(Scene *scene, ARegion *ar, View3D *v3d, draw_dm_vert_normals(em, scene, ob, cageDM); } if (me->drawflag & ME_DRAW_LNORMALS) { - UI_ThemeColor(TH_VNORMAL); + UI_ThemeColor(TH_LNORMAL); draw_dm_loop_normals(em, scene, ob, cageDM); } diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index d1f5cc1eadd..ed59014cf75 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -245,6 +245,7 @@ typedef struct ThemeSpace { char extra_edge_len[4], extra_edge_angle[4], extra_face_angle[4], extra_face_area[4]; char normal[4]; char vertex_normal[4]; + char loop_normal[4]; char bone_solid[4], bone_pose[4], bone_pose_active[4]; char strip[4], strip_select[4]; char cframe[4]; @@ -262,7 +263,7 @@ typedef struct ThemeSpace { char keyborder[4], keyborder_select[4]; char console_output[4], console_input[4], console_info[4], console_error[4]; - char console_cursor[4], console_select[4], pad1[4]; + char console_cursor[4], console_select[4]; char vertex_size, outline_width, facedot_size; char noodle_curving; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index f11780768fd..aa378955fb0 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -1570,6 +1570,12 @@ static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Vertex Normal", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); + prop = RNA_def_property(srna, "split_normal", PROP_FLOAT, PROP_COLOR_GAMMA); + RNA_def_property_float_sdna(prop, NULL, "loop_normal"); + RNA_def_property_array(prop, 3); + RNA_def_property_ui_text(prop, "Split Normal", ""); + RNA_def_property_update(prop, 0, "rna_userdef_update"); + prop = RNA_def_property(srna, "bone_solid", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Bone Solid", "");