Commit: c4501ccb17c4151dbf7fe33760caf7fca996e605
Author: Sergey Sharybin
Date:   Fri Nov 3 16:31:53 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBc4501ccb17c4151dbf7fe33760caf7fca996e605

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesrna/intern/rna_scene_api.c
index b14371d6b8b,0f22f8d3b0f..33d98a341a8
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@@ -85,7 -86,8 +85,7 @@@ static void rna_Scene_frame_set(Scene *
        BPy_BEGIN_ALLOW_THREADS;
  #endif
  
-       BKE_scene_update_for_newframe(G.main->eval_ctx, G.main, scene);
 -      /* It's possible that here we're including layers which were never 
visible before. */
 -      BKE_scene_update_for_newframe_ex(bmain->eval_ctx, bmain, scene, (1 << 
20) - 1, true);
++      BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene);
  
  #ifdef WITH_PYTHON
        BPy_END_ALLOW_THREADS;

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to