diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-03 18:17:01 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-03 18:17:01 +0300 |
| commit | 0c4f69a2bfdc02dbebd2aaf6f6112cf899781321 (patch) | |
| tree | a4016d3054f33aaaf982d52730e3a26b9836cad3 /source/blender/makesrna/intern/rna_scene_api.c | |
| parent | f24103d50afe177c40dffa49092962e6ba8ed648 (diff) | |
| parent | f1c78ecc6337873061afb6ebbb1c9ba2b6642d84 (diff) | |
Merge branch 'master' into blender2.8
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 e4c39aa3b60..b14371d6b8b 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -119,13 +119,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; @@ -350,6 +350,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"); |