diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-25 13:50:32 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-25 13:50:32 +0300 |
commit | e97237892c804a0ea82fe430cf0e1f4d16039dc4 (patch) | |
tree | aea045588506e38ff44a6e04d37a02094a7fddeb /source/blender/draw | |
parent | cdee53edfc4d249ce198965a35cefe32a813854d (diff) | |
parent | 8a7f317666caa41aad0428b5ed3f399cdfbbd816 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/gpu/GPU_draw.h
source/blender/gpu/GPU_material.h
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/creator_args.c
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 7a6771ae058..002333e5d34 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1433,7 +1433,7 @@ void DRW_render_to_image(RenderEngine *engine, struct Depsgraph *depsgraph) Render *render = engine->re; if (G.background && DST.gl_context == NULL) { - WM_init_opengl(); + WM_init_opengl(G_MAIN); } void *re_gl_context = RE_gl_context_get(render); |