Merging r58112 through r58124 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / blenkernel / intern / scene.c
index 3ccd7b6e67489010d45fe80783c2e49d68a72848..0735ff63606c5c5a21db2207caf9b7b26dcc3dce 100644 (file)
@@ -749,7 +749,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 */