Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2018-05-02 16:32:59 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-05-02 16:32:59 +0300
commitae1ba7679c0792361209da8e098b2c47dc60ff2b (patch)
tree26b34cfd29735ae4c71162dcd33a8dfe52c3d207
parent5659d8bc0aa334aee20f29548e048f3002f1cff6 (diff)
Workbench: update of 3dview
-rw-r--r--source/blender/draw/modes/shaders/paint_wire_vert.glsl2
-rw-r--r--source/blender/editors/space_view3d/space_view3d.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/draw/modes/shaders/paint_wire_vert.glsl b/source/blender/draw/modes/shaders/paint_wire_vert.glsl
index e0c3384511f..6a800e56d94 100644
--- a/source/blender/draw/modes/shaders/paint_wire_vert.glsl
+++ b/source/blender/draw/modes/shaders/paint_wire_vert.glsl
@@ -11,7 +11,7 @@ void main()
gl_Position = ModelViewProjectionMatrix * vec4(pos, 1.0);
/* Temp hack for william to start using blender 2.8 for icons. Will be removed by T54910 */
- gl_Position.z -= 0.001;
+ gl_Position.z -= 0.0001;
finalFlag = data;
}
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index d2388259590..c95ed974843 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -1091,6 +1091,10 @@ static void view3d_main_region_message_subscribe(
extern StructRNA RNA_ViewLayerEngineSettingsEevee;
WM_msg_subscribe_rna_anon_type(mbus, ViewLayerEngineSettingsEevee, &msg_sub_value_region_tag_redraw);
}
+ else if (STREQ(scene->r.engine, RE_engine_id_BLENDER_WORKBENCH)) {
+ extern StructRNA RNA_ViewLayerEngineSettingsWorkbench;
+ WM_msg_subscribe_rna_anon_type(mbus, ViewLayerEngineSettingsWorkbench, &msg_sub_value_region_tag_redraw);
+ }
#ifdef WITH_CLAY_ENGINE
else if (STREQ(scene->r.engine, RE_engine_id_BLENDER_CLAY)) {
extern StructRNA RNA_ViewLayerEngineSettingsClay;