From d5778b5bc1663b14449c90d4bc0e84d56f64c156 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 26 Nov 2018 19:00:01 +0100 Subject: UI: rename "OpenGL" render engine to "Workbench". Neither is very descriptive for its task, but at least workbench is more future proof and distinguishes it from Eevee. --- source/blender/draw/engines/workbench/workbench_data.c | 2 +- source/blender/draw/engines/workbench/workbench_engine.c | 6 +++--- source/blender/draw/engines/workbench/workbench_engine.h | 2 +- source/blender/draw/intern/draw_manager.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source/blender/draw') diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c index 94b721dd935..e92cb704216 100644 --- a/source/blender/draw/engines/workbench/workbench_data.c +++ b/source/blender/draw/engines/workbench/workbench_data.c @@ -24,7 +24,7 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd) wpd->use_color_view_settings = true; } else if (v3d->shading.type == OB_RENDER && - BKE_scene_uses_blender_opengl(scene)) + BKE_scene_uses_blender_workbench(scene)) { wpd->shading = scene->display.shading; wpd->use_color_view_settings = true; diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c index 642c5820895..180932b9b64 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.c +++ b/source/blender/draw/engines/workbench/workbench_engine.c @@ -31,12 +31,12 @@ #include "workbench_engine.h" #include "workbench_private.h" -#define OPENGL_ENGINE "BLENDER_OPENGL" +#define WORKBENCH_ENGINE "BLENDER_WORKBENCH" /* Note: currently unused, we may want to register so we can see this when debugging the view. */ -RenderEngineType DRW_engine_viewport_opengl_type = { +RenderEngineType DRW_engine_viewport_workbench_type = { NULL, NULL, - OPENGL_ENGINE, N_("OpenGL"), RE_INTERNAL, + WORKBENCH_ENGINE, N_("Workbench"), RE_INTERNAL, NULL, &DRW_render_to_image, NULL, NULL, NULL, NULL, &workbench_render_update_passes, &draw_engine_workbench_solid, diff --git a/source/blender/draw/engines/workbench/workbench_engine.h b/source/blender/draw/engines/workbench/workbench_engine.h index 24f68cacd21..a7f168db093 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.h +++ b/source/blender/draw/engines/workbench/workbench_engine.h @@ -28,6 +28,6 @@ extern DrawEngineType draw_engine_workbench_solid; extern DrawEngineType draw_engine_workbench_transparent; -extern RenderEngineType DRW_engine_viewport_opengl_type; +extern RenderEngineType DRW_engine_viewport_workbench_type; #endif /* __WORKBENCH_ENGINE_H__ */ diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 71365cac470..94b3bbbd57d 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -2452,7 +2452,7 @@ void DRW_engine_register(DrawEngineType *draw_engine_type) void DRW_engines_register(void) { RE_engines_register(&DRW_engine_viewport_eevee_type); - RE_engines_register(&DRW_engine_viewport_opengl_type); + RE_engines_register(&DRW_engine_viewport_workbench_type); DRW_engine_register(&draw_engine_workbench_solid); DRW_engine_register(&draw_engine_workbench_transparent); -- cgit v1.2.3