griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Sergey Sharybin
2017-11-03 16:31:53 +01:00
parent 0c4f69a2bf 6664ee209e
commit c4501ccb17
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/makesrna/intern/rna_scene_api.c
View File

@@ -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,