Merging r58073 through r58111 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 9 Jul 2013 08:44:06 +0000 (08:44 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 9 Jul 2013 08:44:06 +0000 (08:44 +0000)
1  2 
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/BLI_threads.h
source/blender/blenlib/intern/threads.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_internal.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_curve_types.h
source/blender/windowmanager/WM_api.h

@@@ -171,16 -182,13 +183,23 @@@ int BLI_thread_queue_size(ThreadQueue *
  void BLI_thread_queue_wait_finish(ThreadQueue *queue);
  void BLI_thread_queue_nowait(ThreadQueue *queue);
  
 +/* Condition */
 +
 +typedef pthread_cond_t ThreadCondition;
 +
 +void BLI_condition_init(ThreadCondition *cond);
 +void BLI_condition_wait(ThreadCondition *cond, ThreadMutex *mutex);
 +void BLI_condition_notify_one(ThreadCondition *cond);
 +void BLI_condition_notify_all(ThreadCondition *cond);
 +void BLI_condition_end(ThreadCondition *cond);
 +
+ /* Thread Local Storage */
+ #ifdef _MSC_VER
+ #  define ThreadVariable  __declspec(thread)
+ #else
+ #  define ThreadVariable  __thread
+ #endif
  #ifdef __cplusplus
  }
  #endif
Simple merge