diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-04-24 15:11:05 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-24 15:11:05 +0300 |
commit | 2010dbe8a59e80775219fb5162f3c2f5dfd24e04 (patch) | |
tree | c816bd1504d011b3afac38922bc67e88b76a9505 /source/blender/gpu/intern/gpu_draw.c | |
parent | f93f4169cbfb2e3d5583d1bca5aa8466f37393dc (diff) | |
parent | aff30aaf2dddeb30ae43ec45ff12073a73ffcdc0 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu/intern/gpu_draw.c')
-rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index a213d8dd911..01759338744 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -1897,7 +1897,7 @@ static void GPU_get_object_info(float oi[3], Material *mat) else { random = BLI_hash_int_2d(BLI_hash_string(GMS.gob->id.name + 2), 0); } - oi[2] = random * (1.0f/(float)0xFFFFFFFF); + oi[2] = random * (1.0f / (float)0xFFFFFFFF); } int GPU_object_material_bind(int nr, void *attribs) |