diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-07 19:02:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-07 19:02:48 +0300 |
| commit | b49184b608df297195c5f0e81da4d8d9ddfb9213 (patch) | |
| tree | c2624887be563319a7138516d2fcc6100acdb2c6 /source/blender/modifiers/intern/MOD_particleinstance.c | |
| parent | f62b826533422e5de3b08601e5511c233deda529 (diff) | |
| parent | f74d85ffc8232a859b1419f5dc25b244ae04375f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_particleinstance.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_particleinstance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index b93e567fe56..651a5a96676 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -197,7 +197,7 @@ static bool particle_skip(ParticleInstanceModifierData *pimd, ParticleSystem *ps static void store_float_in_vcol(MLoopCol *vcol, float float_value) { - const uchar value = FTOCHAR(float_value); + const uchar value = unit_float_to_uchar_clamp(float_value); vcol->r = vcol->g = vcol->b = value; vcol->a = 1.0f; } |