[Bf-blender-cvs] [f1c78ecc633] master: Scene RNA API: Main from globals goes away

[Sergey Sharybin]

Commit: f1c78ecc6337873061afb6ebbb1c9ba2b6642d84
Author: Sergey Sharybin
Date:   Fri Nov 3 16:15:49 2017 +0100
Branches: master
https://developer.blender.org/rBf1c78ecc6337873061afb6ebbb1c9ba2b6642d84

Scene RNA API: Main from globals goes away

Bye bye..

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

M	source/blender/makesrna/intern/rna_scene_api.c

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

diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index e39ab6319d7..cef720eff0a 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -121,13 +121,13 @@ static void rna_Scene_uvedit_aspect(Scene *scene, Object *ob, float *aspect)
 	aspect[0] = aspect[1] = 1.0f;
 }
 
-static void rna_Scene_update_tagged(Scene *scene)
+static void rna_Scene_update_tagged(Scene *scene, Main *bmain)
 {
 #ifdef WITH_PYTHON
 	BPy_BEGIN_ALLOW_THREADS;
 #endif
 
-	BKE_scene_update_tagged(G.main->eval_ctx, G.main, scene);
+	BKE_scene_update_tagged(bmain->eval_ctx, bmain, scene);
 
 #ifdef WITH_PYTHON
 	BPy_END_ALLOW_THREADS;
@@ -335,6 +335,7 @@ void RNA_api_scene(StructRNA *srna)
 	func = RNA_def_function(srna, "update", "rna_Scene_update_tagged");
 	RNA_def_function_ui_description(func,
 	                                "Update data tagged to be updated from previous access to data or operators");
+	RNA_def_function_flag(func, FUNC_USE_MAIN);
 
 	func = RNA_def_function(srna, "uvedit_aspect", "rna_Scene_uvedit_aspect");
 	RNA_def_function_ui_description(func, "Get uv aspect for current object");