Commit: e867f40611deea6cb100dcf52eebcc5df23166d9
Author: Jeroen Bakker
Date: Fri Mar 26 10:40:27 2021 +0100
Branches: master
https://developer.blender.org/rBe867f40611deea6cb100dcf52eebcc5df23166d9
Cleanup: Replaced unneeded branch with assert.
===================================================================
M source/blender/compositor/intern/COM_CompositorContext.cc
===================================================================
diff --git a/source/blender/compositor/intern/COM_CompositorContext.cc
b/source/blender/compositor/intern/COM_CompositorContext.cc
index e2447fb5c13..a746ccbc09f 100644
--- a/source/blender/compositor/intern/COM_CompositorContext.cc
+++ b/source/blender/compositor/intern/COM_CompositorContext.cc
@@ -20,6 +20,8 @@
#include "COM_defines.h"
#include <cstdio>
+#include "BLI_assert.h"
+
CompositorContext::CompositorContext()
{
this->m_scene = nullptr;
@@ -33,9 +35,6 @@ 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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
