diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-12 23:51:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-12 23:51:10 +0300 |
| commit | 4dacda58f96d91fd4f358f418bf450bbc4bb3a43 (patch) | |
| tree | 9829793ba6858d49795e77cda2bb0835f35a4faa /source/blender/render | |
| parent | 6d3d2b15cbda4a51a1bbed055c35aa01b3d7c375 (diff) | |
| parent | e8021f5e3bd41d2447c35d999aef1a7588bc039a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/shadeoutput.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c index c4de95e863e..a8fb72fb7f8 100644 --- a/source/blender/render/intern/source/shadeoutput.c +++ b/source/blender/render/intern/source/shadeoutput.c @@ -2143,7 +2143,7 @@ const float (*RE_object_instance_get_matrix(struct ObjectInstanceRen *obi, int m const float (*RE_render_current_get_matrix(int matrix_id))[4] { - switch(matrix_id) { + switch (matrix_id) { case RE_VIEW_MATRIX: return (const float(*)[4])R.viewmat; case RE_VIEWINV_MATRIX: @@ -2171,4 +2171,4 @@ float RE_fresnel_dielectric(float incoming[3], float normal[3], float eta) } return result; -}
\ No newline at end of file +} |