diff options
| author | Phil Gosch <phil@saphirestudio.at> | 2017-09-29 23:52:29 +0300 |
|---|---|---|
| committer | Phil Gosch <phil@saphirestudio.at> | 2017-09-29 23:52:29 +0300 |
| commit | 2b1ec9c18fadf6b5cd71a7d4122776f5d4b8ac33 (patch) | |
| tree | 01b477f0ea027ab5908f332f6102db6a1d381b76 /source/blender/render/intern/source/shadeinput.c | |
| parent | 5cdd4388ffaad5ade916dba3c18e2bc679e19747 (diff) | |
| parent | e3546a5097b1b30a3c694ce0f6b98c2f7e70510c (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2016-uv_toolssoc-2016-uv_tools
Diffstat (limited to 'source/blender/render/intern/source/shadeinput.c')
| -rw-r--r-- | source/blender/render/intern/source/shadeinput.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/render/intern/source/shadeinput.c b/source/blender/render/intern/source/shadeinput.c index 20602314526..b4ff5f52fcf 100644 --- a/source/blender/render/intern/source/shadeinput.c +++ b/source/blender/render/intern/source/shadeinput.c @@ -292,12 +292,8 @@ void shade_input_set_triangle_i(ShadeInput *shi, ObjectInstanceRen *obi, VlakRen } } -/* note, facenr declared volatile due to over-eager -O2 optimization's - * on cygwin (particularly -frerun-cse-after-loop) - */ - /* copy data from face to ShadeInput, scanline case */ -void shade_input_set_triangle(ShadeInput *shi, volatile int obi, volatile int facenr, int UNUSED(normal_flip)) +void shade_input_set_triangle(ShadeInput *shi, int obi, int facenr, int UNUSED(normal_flip)) { if (facenr > 0) { shi->obi = &R.objectinstance[obi]; |