diff options
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_threads.h | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 5b09f65d7db..744a8247233 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -748,7 +748,7 @@ void BKE_scene_unlink(Main *bmain, Scene *sce, Scene *newsce) */ int BKE_scene_base_iter_next(SceneBaseIter *iter, Scene **scene, int val, Base **base, Object **ob) { - static ThreadVariable int in_next_object = 0; + static int in_next_object = 0; int run_again = 1; /* init */ diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h index ec558188270..154986936a2 100644 --- a/source/blender/blenlib/BLI_threads.h +++ b/source/blender/blenlib/BLI_threads.h @@ -182,13 +182,6 @@ int BLI_thread_queue_size(ThreadQueue *queue); void BLI_thread_queue_wait_finish(ThreadQueue *queue); void BLI_thread_queue_nowait(ThreadQueue *queue); -/* Thread Local Storage */ -#ifdef _MSC_VER -# define ThreadVariable __declspec(thread) -#else -# define ThreadVariable __thread -#endif - #ifdef __cplusplus } #endif |