diff options
author | Julian Eisel <julian@blender.org> | 2021-03-31 23:53:03 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2021-03-31 23:53:03 +0300 |
commit | c7904d2398fd4d43d15268c792aa15ea8ee538fe (patch) | |
tree | 484fd7f66ac59c82abd4aca18894f991b4935483 /source/blender/compositor/intern/COM_CompositorContext.cc | |
parent | 91b87d8d7fb8aec62faf00e5e0c3619d2753a92e (diff) | |
parent | 1a100d2d78c75c9a6ac015606cc16698e7775682 (diff) |
Merge branch 'master' into ui-asset-view-templateui-asset-view-template
Diffstat (limited to 'source/blender/compositor/intern/COM_CompositorContext.cc')
-rw-r--r-- | source/blender/compositor/intern/COM_CompositorContext.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/compositor/intern/COM_CompositorContext.cc b/source/blender/compositor/intern/COM_CompositorContext.cc index e2447fb5c13..fdd47a6ca79 100644 --- a/source/blender/compositor/intern/COM_CompositorContext.cc +++ b/source/blender/compositor/intern/COM_CompositorContext.cc @@ -20,6 +20,10 @@ #include "COM_defines.h" #include <cstdio> +#include "BLI_assert.h" + +namespace blender::compositor { + CompositorContext::CompositorContext() { this->m_scene = nullptr; @@ -33,9 +37,8 @@ CompositorContext::CompositorContext() int CompositorContext::getFramenumber() const { - if (this->m_rd) { - return this->m_rd->cfra; - } - - return -1; /* this should never happen */ + BLI_assert(m_rd); + return m_rd->cfra; } + +} // namespace blender::compositor |