diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-03 18:15:49 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-03 18:15:49 +0300 |
| commit | f1c78ecc6337873061afb6ebbb1c9ba2b6642d84 (patch) | |
| tree | 9bb981952c222cd89d7cb7763e88839977c64aa9 /source/blender/makesrna/intern/rna_scene_api.c | |
| parent | 2a87bd89951204a5dd15b60ba86cbba72fc3b088 (diff) | |
Scene RNA API: Main from globals goes away
Bye bye..
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene_api.c | 5 |
1 files changed, 3 insertions, 2 deletions
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"); |