Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Werner <stefan.werner@tangent-animation.com>2018-06-26 11:26:56 +0300
committerStefan Werner <stefan.werner@tangent-animation.com>2018-06-26 11:26:56 +0300
commit73eb1bfd55d51f1dfeb6c49560e0096c9214a105 (patch)
treebc423c42b161db734a38b86500bbea4d00e58fe2 /intern/cycles/render/shader.h
parentdf237b964b9c24c9ab315f6f31bf67990f1c2f7e (diff)
Revert "Turned off clang warnings in third party includes."
This reverts commit d53093953f8f3b58600cb19020ecbe0b5f254b52.
Diffstat (limited to 'intern/cycles/render/shader.h')
-rw-r--r--intern/cycles/render/shader.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h
index dd346ef5795..0353da90013 100644
--- a/intern/cycles/render/shader.h
+++ b/intern/cycles/render/shader.h
@@ -20,10 +20,7 @@
#ifdef WITH_OSL
/* So no context pollution happens from indirectly included windows.h */
# include "util/util_windows.h"
-# pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wdeprecated-register"
# include <OSL/oslexec.h>
-# pragma clang diagnostic pop
#endif
#include "render/attribute.h"