diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-10-02 14:15:37 +0300 |
| commit | 386ba094988fc793f8e060d15438566e5e2d2cae (patch) | |
| tree | 4cbde50b5d1d7a45c89ee99c29dd1b86d1d97b59 /source/blender/python/gpu/gpu_py_offscreen.c | |
| parent | 6129e20cec4639aebf335ff13b2ba0c59670662d (diff) | |
| parent | f97a64aa9b7b384f8221a1ef4f2eef9cde1238db (diff) | |
Merge branch 'master' into temp-gpencil-drw-engine
Conflicts:
source/blender/draw/engines/gpencil/gpencil_engine.c
Diffstat (limited to 'source/blender/python/gpu/gpu_py_offscreen.c')
| -rw-r--r-- | source/blender/python/gpu/gpu_py_offscreen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/python/gpu/gpu_py_offscreen.c b/source/blender/python/gpu/gpu_py_offscreen.c index b5f4d26220a..70f76896898 100644 --- a/source/blender/python/gpu/gpu_py_offscreen.c +++ b/source/blender/python/gpu/gpu_py_offscreen.c @@ -32,6 +32,7 @@ #include "BLI_utildefines.h" +#include "BKE_global.h" #include "BKE_library.h" #include "BKE_scene.h" @@ -238,7 +239,7 @@ static PyObject *bpygpu_offscreen_draw_view3d(BPyGPUOffScreen *self, BLI_assert(BKE_id_is_in_global_main(&scene->id)); - depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true); + depsgraph = BKE_scene_get_depsgraph(G_MAIN, scene, view_layer, true); rv3d_mats = ED_view3d_mats_rv3d_backup(ar->regiondata); |