diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-03 18:31:53 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-03 18:31:53 +0300 |
| commit | c4501ccb17c4151dbf7fe33760caf7fca996e605 (patch) | |
| tree | af4ad824253bc35f6a604087737491152a6627ab /source/blender/makesrna/intern/rna_scene_api.c | |
| parent | 0c4f69a2bfdc02dbebd2aaf6f6112cf899781321 (diff) | |
| parent | 6664ee209e96fe4a4ae8018bcf10f798a3b53751 (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 b14371d6b8b..33d98a341a8 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -74,7 +74,7 @@ const EnumPropertyItem rna_enum_abc_compression_items[] = { # include "BPY_extern.h" #endif -static void rna_Scene_frame_set(Scene *scene, int frame, float subframe) +static void rna_Scene_frame_set(Scene *scene, Main *bmain, int frame, float subframe) { double cfra = (double)frame + (double)subframe; @@ -85,7 +85,7 @@ static void rna_Scene_frame_set(Scene *scene, int frame, float subframe) BPy_BEGIN_ALLOW_THREADS; #endif - BKE_scene_update_for_newframe(G.main->eval_ctx, G.main, scene); + BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene); #ifdef WITH_PYTHON BPy_END_ALLOW_THREADS; @@ -346,6 +346,7 @@ void RNA_api_scene(StructRNA *srna) parm = RNA_def_int(func, "frame", 0, MINAFRAME, MAXFRAME, "", "Frame number to set", MINAFRAME, MAXFRAME); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); RNA_def_float(func, "subframe", 0.0, 0.0, 1.0, "", "Sub-frame time, between 0.0 and 1.0", 0.0, 1.0); + RNA_def_function_flag(func, FUNC_USE_MAIN); func = RNA_def_function(srna, "update", "rna_Scene_update_tagged"); RNA_def_function_ui_description(func, |