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:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-07-09 22:38:33 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-07-09 22:38:33 +0400
commit677e136e4b89c9b1a89c19fc8290d4a4a2e77ec4 (patch)
tree21406d180d0de9434850f46ae767f5f1723f8a18 /source/blender/blenkernel/intern/scene.c
parent8491814a107f3b90bddfbe296d32d1564f3455ea (diff)
Partial revert of rev58110
There's one thing we didn't foresee from the beginning, which is apparently TLS is only available in OSX starting from version 10.7, and we still do support of 10.6. After recent Brecht's changes about locked viewport while initializing BI render this TLS is not needed in trunk anymore. So reverting this chunk of base iteration to use static variable. But leaving all the other static variables warped into context still, it should help a bit in the future refactor. Real fix would be to have some kind of graph context evaluation structure which would be passing to update routines (which will solve threaded mballs update) and making depsgraph responsible for getting a motherball. But this is all for GSoC project.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r--source/blender/blenkernel/intern/scene.c2
1 files changed, 1 insertions, 1 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 */