diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-17 15:07:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-17 15:07:00 +0300 |
| commit | 3af98b4c04b33791254a4abe0a03ed65007d5e9a (patch) | |
| tree | c07a9c722b94b1cdc0648c98cefff4ea61cf6c39 /source/gameengine | |
| parent | 1bfe359802a105f5075e9e17c29cd832add619fd (diff) | |
| parent | 6c3d8fbeb399c394831137b511c02df642fade92 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/CMakeLists.txt
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/physics/physics_ops.c
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/VideoTexture/ImageRender.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index 9991bf42a9f..7e8c534d7d5 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -734,6 +734,7 @@ ImageRender::ImageRender (KX_Scene *scene, KX_GameObject *observer, KX_GameObjec m_done(false), m_scene(scene), m_offscreen(NULL), + m_sync(NULL), m_observer(observer), m_mirror(mirror), m_clip(100.f) |