diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-03-03 14:06:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-03 14:23:10 +0300 |
| commit | ce2dc6ef2bce1fdd038989e0a7841600daccfd49 (patch) | |
| tree | 17e83416a6fe99827941bff0dc5d7c3e510e6e0c /source/blender/draw/intern | |
| parent | 582205c13449e41cc876d6df951c354e897419ea (diff) | |
Cleanup: formatting, spelling
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/shaders/common_globals_lib.glsl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index 43e8e2a4733..6f2a9cc056f 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -514,7 +514,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob) ob_infos->ob_flag += (ob->base_flag & BASE_FROM_DUPLI) ? (1 << 2) : 0; ob_infos->ob_flag += (ob->base_flag & BASE_FROM_SET) ? (1 << 3) : 0; ob_infos->ob_flag += (ob == DST.draw_ctx.obact) ? (1 << 4) : 0; - /* Negative scalling. */ + /* Negative scaling. */ ob_infos->ob_flag *= (ob->transflag & OB_NEG_SCALE) ? -1.0f : 1.0f; /* Object Color. */ copy_v4_v4(ob_infos->ob_color, ob->color); diff --git a/source/blender/draw/intern/shaders/common_globals_lib.glsl b/source/blender/draw/intern/shaders/common_globals_lib.glsl index 1777b5e23fc..6a3bf150095 100644 --- a/source/blender/draw/intern/shaders/common_globals_lib.glsl +++ b/source/blender/draw/intern/shaders/common_globals_lib.glsl @@ -104,7 +104,7 @@ layout(std140) uniform globalsBlock vec4 screenVecs[2]; vec4 sizeViewport; /* Inverted size in zw. */ - float sizePixel; /* This one is for dpi scalling */ + float sizePixel; /* This one is for dpi scaling */ float pixelFac; /* To use with mul_project_m4_v3_zfac() */ float sizeObjectCenter; float sizeLightCenter; |