diff options
| author | OmarSquircleArt <omar.squircleart@gmail.com> | 2019-08-10 16:18:12 +0300 |
|---|---|---|
| committer | OmarSquircleArt <omar.squircleart@gmail.com> | 2019-08-10 16:18:12 +0300 |
| commit | 67474a7e622957044bc708119a7cfa49a82790fd (patch) | |
| tree | 1689263da79f08b1c3c9725ac56c3da8b5d91fbb /source/blender/gpu/intern/gpu_context.cpp | |
| parent | b091542fe91353c15dd7240ba7ce8ecf72d4011b (diff) | |
| parent | 553b581f25c1782c4231816965cd3f6ce58a449a (diff) | |
Merge master to soc-2019-cycles-procedural.soc-2019-cycles-procedural
Diffstat (limited to 'source/blender/gpu/intern/gpu_context.cpp')
| -rw-r--r-- | source/blender/gpu/intern/gpu_context.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/gpu/intern/gpu_context.cpp b/source/blender/gpu/intern/gpu_context.cpp index a0e03e61d5d..97f9e52f944 100644 --- a/source/blender/gpu/intern/gpu_context.cpp +++ b/source/blender/gpu/intern/gpu_context.cpp @@ -88,12 +88,7 @@ struct GPUContext { } }; -#if defined(_MSC_VER) && (_MSC_VER == 1800) -# define thread_local __declspec(thread) -thread_local GPUContext *active_ctx = NULL; -#else static thread_local GPUContext *active_ctx = NULL; -#endif static void orphans_add(GPUContext *ctx, std::vector<GLuint> *orphan_list, GLuint id) { |