griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix wire-toggle restoring previous shading mode

Browse Source
This commit is contained in:
Campbell Barton
2018-11-23 16:25:00 +11:00
parent 811814b60c
commit 93c143ecf3
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/space_view3d/view3d_edit.c
View File

@@ -4872,7 +4872,7 @@ static int toggle_shading_exec(bContext *C, wmOperator *op)
ScrArea *sa = CTX_wm_area(C);
int type = RNA_enum_get(op->ptr, "type");
if (ELEM(type, OB_WIRE, OB_SOLID)) {
if (type == OB_SOLID) {
if (v3d->shading.type != type) {
v3d->shading.type = type;
}
@@ -4884,12 +4884,18 @@ static int toggle_shading_exec(bContext *C, wmOperator *op)
}
}
else {
char *prev_type = (
(type == OB_WIRE) ?
&v3d->shading.prev_type_wire :
&v3d->shading.prev_type));
if (v3d->shading.type == type) {
v3d->shading.type = v3d->shading.prev_type;
if (*prev_type == type || !ELEM(*prev_type, OB_WIRE, OB_SOLID, OB_MATERIAL, OB_RENDER)) {
*prev_type = OB_SOLID;
}
v3d->shading.type = *prev_type;
}
else {
v3d->shading.prev_type = v3d->shading.type;
*prev_type = v3d->shading.type;
v3d->shading.type = type;
}
}

8
source/blender/makesdna/DNA_view3d_types.h
View File

@@ -135,12 +135,12 @@ typedef struct View3DCursor {
/* 3D Viewport Shading settings */
typedef struct View3DShading {
short type; /* Shading type (VIEW3D_SHADE_SOLID, ..) */
short prev_type; /* Runtime, for toggle between rendered viewport. */
char type; /* Shading type (VIEW3D_SHADE_SOLID, ..) */
char prev_type; /* Runtime, for toggle between rendered viewport. */
char prev_type_wire;
short flag;
char color_type;
char _pad0[7];
short flag;
char light;
char background_type;