[Bf-blender-cvs] [85c843b115e] master: Remove compiler fix for unsupported MSVC version

Julian Eisel noreply at git.blender.org
Wed Aug 7 01:56:20 CEST 2019


Commit: 85c843b115e7e6a4472143255495b542be1c3c1a
Author: Julian Eisel
Date:   Wed Aug 7 01:46:35 2019 +0200
Branches: master
https://developer.blender.org/rB85c843b115e7e6a4472143255495b542be1c3c1a

Remove compiler fix for unsupported MSVC version

===================================================================

M	source/blender/gpu/intern/gpu_context.cpp

===================================================================

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)
 {



More information about the Bf-blender-cvs mailing list