[Bf-blender-cvs] [2e8e7bd7b96] temp-viewport-compositor-merge: Viewport Compositor: Only update engine after init

Omar Emara noreply at git.blender.org
Thu May 12 15:08:46 CEST 2022


Commit: 2e8e7bd7b9632122e5d8e83b1ac0690522433c15
Author: Omar Emara
Date:   Thu May 12 14:45:15 2022 +0200
Branches: temp-viewport-compositor-merge
https://developer.blender.org/rB2e8e7bd7b9632122e5d8e83b1ac0690522433c15

Viewport Compositor: Only update engine after init

The update callback might get called after the engine is initialized, so
make sure it is first.

===================================================================

M	source/blender/draw/engines/compositor/compositor_engine.cc

===================================================================

diff --git a/source/blender/draw/engines/compositor/compositor_engine.cc b/source/blender/draw/engines/compositor/compositor_engine.cc
index 636339af18c..a46f909f154 100644
--- a/source/blender/draw/engines/compositor/compositor_engine.cc
+++ b/source/blender/draw/engines/compositor/compositor_engine.cc
@@ -155,7 +155,9 @@ static void compositor_engine_draw(void *data)
 static void compositor_engine_update(void *data)
 {
   const CompositorData *compositor_data = static_cast<CompositorData *>(data);
-  compositor_data->instance_data->update(DRW_context_state_get()->depsgraph);
+  if (compositor_data->instance_data) {
+    compositor_data->instance_data->update(DRW_context_state_get()->depsgraph);
+  }
 }
 
 extern "C" {



More information about the Bf-blender-cvs mailing list