diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-07 16:41:57 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-07 16:41:57 +0300 |
| commit | 1e4722eeabcc9c53616ab42b45e8a93206d46b73 (patch) | |
| tree | 226a5ca90902ae95a7b7032b05b4db94b2a3fc8e | |
| parent | d9d3e7778c9d0cb495620e1f5b483038f0193d09 (diff) | |
| parent | 8a2db3ed21c0eff7ee293c6a24c614283a8ed73f (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/transform/transform_generics.c
| -rw-r--r-- | source/blender/editors/transform/transform_generics.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index fac0661004f..d3fcd5e5911 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -359,6 +359,7 @@ static void recalcData_actedit(TransInfo *t) /* initialize relevant anim-context 'context' data from TransInfo data */ /* NOTE: sync this with the code in ANIM_animdata_get_context() */ + ac.bmain = CTX_data_main(t->context); ac.scene = t->scene; ac.view_layer = t->view_layer; ac.obact = OBACT(view_layer); @@ -409,6 +410,7 @@ static void recalcData_graphedit(TransInfo *t) /* initialize relevant anim-context 'context' data from TransInfo data */ /* NOTE: sync this with the code in ANIM_animdata_get_context() */ + ac.bmain = CTX_data_main(t->context); ac.scene = t->scene; ac.view_layer = t->view_layer; ac.obact = OBACT(view_layer); |