blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Make Shift-Z in viewprot a toggle between current shading mode and rendered one 

This way it is now possible to toggle between material and rendered shading
while previously rendered viewport will always go back to solid shading.
This commit is contained in:
Sergey Sharybin 2016-05-22 15:44:18 +02:00
parent 120492ace9
commit 0cc514ec84
Notes: blender-bot 2023-02-14 19:43:11 +01:00 
Referenced by issue blender/blender-addons#50308, RenderEngine - use of python threads with sleep(0)/wait(0) crash
5 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenloader/intern/readfile.c
View File

@ -6935,6 +6935,7 @@ static bool direct_link_screen(FileData *fd, bScreen *sc)
/* render can be quite heavy, set to solid on load */
if (v3d->drawtype == OB_RENDER)
v3d->drawtype = OB_SOLID;
v3d->prev_drawtype = OB_SOLID;
if (v3d->fx_settings.dof)
v3d->fx_settings.dof = newdataadr(fd, v3d->fx_settings.dof);

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

@ -4848,6 +4848,35 @@ void VIEW3D_OT_enable_manipulator(wmOperatorType *ot)
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}
/* ************************* Toggle rendered shading *********************** */
static int toggle_render_exec(bContext *C, wmOperator *UNUSED(op))
{
View3D *v3d = CTX_wm_view3d(C);
if (v3d->drawtype == OB_RENDER) {
v3d->drawtype = v3d->prev_drawtype;
}
else {
v3d->prev_drawtype = v3d->drawtype;
v3d->drawtype = OB_RENDER;
}
ED_view3d_shade_update(CTX_data_main(C), CTX_data_scene(C), v3d, CTX_wm_area(C));
WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, v3d);
return OPERATOR_FINISHED;
}
void VIEW3D_OT_toggle_render(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Toggle Rendered Shading";
ot->description = "Toggle rendered shading mode of the viewport";
ot->idname = "VIEW3D_OT_toggle_render";
/* api callbacks */
ot->exec = toggle_render_exec;
ot->poll = ED_operator_view3d_active;
}
/* ************************* below the line! *********************** */

1
source/blender/editors/space_view3d/view3d_intern.h
View File

@ -103,6 +103,7 @@ void VIEW3D_OT_enable_manipulator(struct wmOperatorType *ot);
void VIEW3D_OT_render_border(struct wmOperatorType *ot);
void VIEW3D_OT_clear_render_border(struct wmOperatorType *ot);
void VIEW3D_OT_zoom_border(struct wmOperatorType *ot);
void VIEW3D_OT_toggle_render(struct wmOperatorType *ot);
void view3d_boxview_copy(ScrArea *sa, ARegion *ar);

9
source/blender/editors/space_view3d/view3d_ops.c
View File

@ -218,7 +218,9 @@ void view3d_operatortypes(void)
WM_operatortype_append(VIEW3D_OT_snap_cursor_to_center);
WM_operatortype_append(VIEW3D_OT_snap_cursor_to_selected);
WM_operatortype_append(VIEW3D_OT_snap_cursor_to_active);
WM_operatortype_append(VIEW3D_OT_toggle_render);
transform_operatortypes();
}
@ -417,10 +419,7 @@ void view3d_keymap(wmKeyConfig *keyconf)
RNA_string_set(kmi->ptr, "value_1", "SOLID");
RNA_string_set(kmi->ptr, "value_2", "TEXTURED");
kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", ZKEY, KM_PRESS, KM_SHIFT, 0);
RNA_string_set(kmi->ptr, "data_path", "space_data.viewport_shade");
RNA_string_set(kmi->ptr, "value_1", "SOLID");
RNA_string_set(kmi->ptr, "value_2", "RENDERED");
WM_keymap_add_item(keymap, "VIEW3D_OT_toggle_render", ZKEY, KM_PRESS, KM_SHIFT, 0);
/* selection*/
kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_select", SELECTMOUSE, KM_PRESS, 0, 0);

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

@ -237,6 +237,13 @@ typedef struct View3D {
float stereo3d_convergence_factor;
float stereo3d_volume_alpha;
float stereo3d_convergence_alpha;
/* Previous viewport draw type.
* Runtime-only, set in the rendered viewport otggle operator.
*/
short prev_drawtype;
short pad1;
float pad2;
} View3D;