diff options
| author | Luca Rood <dev@lucarood.com> | 2017-06-06 10:56:27 +0300 |
|---|---|---|
| committer | Luca Rood <dev@lucarood.com> | 2017-06-06 10:57:18 +0300 |
| commit | 4e1257f2d86d71cd883803ea15a1bcb44aa661c7 (patch) | |
| tree | f7201276dfa51452483040c7ac2bf01846c623fb /source/blender/draw/modes/object_mode.c | |
| parent | 443904f1f4f9f0b45e4ef10ec4b5c9392559ada0 (diff) | |
Make particle size follow world space instead of screen space
Diffstat (limited to 'source/blender/draw/modes/object_mode.c')
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 45e035acc73..7ca8006f36c 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -1461,7 +1461,8 @@ static void OBJECT_cache_populate_particles(Object *ob, shgrp = DRW_shgroup_create(e_data.part_dot_sh, psl->particle); DRW_shgroup_uniform_vec3(shgrp, "color", ma ? &ma->r : def_prim_col, 1); DRW_shgroup_uniform_vec3(shgrp, "outlineColor", ma ? &ma->specr : def_sec_col, 1); - DRW_shgroup_uniform_short_to_int(shgrp, "size", &part->draw_size, 1); + DRW_shgroup_uniform_float(shgrp, "pixel_size", DRW_viewport_pixelsize_get(), 1); + DRW_shgroup_uniform_float(shgrp, "size", &part->draw_size, 1); DRW_shgroup_uniform_texture(shgrp, "ramp", globals_ramp); DRW_shgroup_call_add(shgrp, geom, mat); break; @@ -1487,8 +1488,7 @@ static void OBJECT_cache_populate_particles(Object *ob, if (shgrp) { if (draw_as != PART_DRAW_DOT) { - DRW_shgroup_uniform_short_to_int(shgrp, "draw_size", &part->draw_size, 1); - DRW_shgroup_uniform_float(shgrp, "pixel_size", DRW_viewport_pixelsize_get(), 1); + DRW_shgroup_uniform_float(shgrp, "draw_size", &part->draw_size, 1); DRW_shgroup_instance_batch(shgrp, geom); } } |