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/nodes | |
| parent | f93f4169cbfb2e3d5583d1bca5aa8466f37393dc (diff) | |
| parent | aff30aaf2dddeb30ae43ec45ff12073a73ffcdc0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_object_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_object_info.c b/source/blender/nodes/shader/nodes/node_shader_object_info.c index 165d565a5b4..63d3bac88a0 100644 --- a/source/blender/nodes/shader/nodes/node_shader_object_info.c +++ b/source/blender/nodes/shader/nodes/node_shader_object_info.c @@ -48,7 +48,7 @@ static void node_shader_exec_object_info(void *data, int UNUSED(thread), bNode * copy_v4_v4(out[0]->vec, RE_object_instance_get_matrix(scd->shi->obi, RE_OBJECT_INSTANCE_MATRIX_OB)[3]); out[1]->vec[0] = RE_object_instance_get_object_pass_index(scd->shi->obi); out[2]->vec[0] = scd->shi->mat->index; - out[3]->vec[0] = RE_object_instance_get_random_id(scd->shi->obi) * (1.0f/(float)0xFFFFFFFF);; + out[3]->vec[0] = RE_object_instance_get_random_id(scd->shi->obi) * (1.0f / (float)0xFFFFFFFF); } /* node type definition */ |