diff options
| author | Schoen <schoepas@deher1m1598.emea.adsint.biz> | 2017-04-03 08:52:05 +0300 |
|---|---|---|
| committer | Schoen <schoepas@deher1m1598.emea.adsint.biz> | 2017-04-03 09:47:02 +0300 |
| commit | 90778901c9ea1e16d5907981e91bceba25ff207d (patch) | |
| tree | 00bf16ee403c3ab1b507a5ec90b098a22e050f7c /source/blender/render/intern/source/shadeoutput.c | |
| parent | 76eebd9379a5dad519ff01cf215fbe3db6de931e (diff) | |
| parent | 3bf0026bec6f839ae0f7c40bde845299ce22e8de (diff) | |
Merge branch 'master' into cycles_disney_brdfcycles_disney_brdf
Diffstat (limited to 'source/blender/render/intern/source/shadeoutput.c')
| -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 +} |