Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -121,9 +121,9 @@ bool CVolumeTexture::Update([[maybe_unused]] unsigned int width, [[maybe_unused]
    }

    m_FrameIndex ^= m_FrameIndex;
-    uint8_t* stagingData = GetCurrentStagingData();
    
 #if !defined(NULL_RENDERER)
+    uint8_t* stagingData = GetCurrentStagingData();
    unsigned int cpyWidth = min(width, m_width);
    unsigned int cpyHeight = min(height, m_height);
    unsigned int cpyDepth = min(depth, m_depth);