diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2022-04-05 15:36:53 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2022-04-05 15:36:53 +0300 |
commit | d889762590a4f068aa312879976e98dbd0ee93fc (patch) | |
tree | 8e1726d78e867659cd61379151f3f228244c3c68 /source/blender/draw/engines/workbench | |
parent | c8d658c5ed68b7d8ce3702cee0e58438da52e88e (diff) |
Cleanup: Change globalBlock members to snake case
This avoid conflicting defines in GLSL
Fix T96998 Blender 3.2.0 Alpha crashes on startup
Diffstat (limited to 'source/blender/draw/engines/workbench')
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c index 010f424b9da..326727685fc 100644 --- a/source/blender/draw/engines/workbench/workbench_data.c +++ b/source/blender/draw/engines/workbench/workbench_data.c @@ -275,7 +275,7 @@ void workbench_update_world_ubo(WORKBENCH_PrivateData *wpd) copy_v2_v2(wd.viewport_size_inv, DRW_viewport_invert_size_get()); copy_v3_v3(wd.object_outline_color, wpd->shading.object_outline_color); wd.object_outline_color[3] = 1.0f; - wd.ui_scale = DRW_state_is_image_render() ? 1.0f : G_draw.block.sizePixel; + wd.ui_scale = DRW_state_is_image_render() ? 1.0f : G_draw.block.size_pixel; wd.matcap_orientation = (wpd->shading.flag & V3D_SHADING_MATCAP_FLIP_X) != 0; workbench_studiolight_data_update(wpd, &wd); |