Insert null checks for artboards with no drawables #178

2d-inc · Oct 25, 2019 · 528af53 · luigi-rosso · Oct 25, 2019 · 528af53
1 parent 33f23a7
commit 528af53
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/flare_dart/lib/actor_artboard.dart b/flare_dart/lib/actor_artboard.dart
@@ -67,16 +67,20 @@ class ActorArtboard {
   Float32List get overrideColor => _overrideColor;
 
   set overrideColor(Float32List value) {
-    _overrideColor = value;
-    for (final ActorDrawable drawable in _drawableNodes) {
-      addDirt(drawable, DirtyFlags.paintDirty, true);
+    if (_drawableNodes != null) {
+      _overrideColor = value;
+      for (final ActorDrawable drawable in _drawableNodes) {
+        addDirt(drawable, DirtyFlags.paintDirty, true);
+      }
     }
   }
 
   set modulateOpacity(double value) {
-    _modulateOpacity = value;
-    for (final ActorDrawable drawable in _drawableNodes) {
-      addDirt(drawable, DirtyFlags.paintDirty, true);
+    if (_drawableNodes != null) {
+      _modulateOpacity = value;
+      for (final ActorDrawable drawable in _drawableNodes) {
+        addDirt(drawable, DirtyFlags.paintDirty, true);
+      }
     }
   }
 
@@ -570,8 +574,10 @@ class ActorArtboard {
   }
 
   void initializeGraphics() {
-    for (final ActorDrawable drawable in _drawableNodes) {
-      drawable.initializeGraphics();
+    if (_drawableNodes != null) {
+      for (final ActorDrawable drawable in _drawableNodes) {
+        drawable.initializeGraphics();
+      }
     }
   }
 
@@ -600,6 +606,10 @@ class ActorArtboard {
   }
 
   AABB computeAABB() {
+    if (_drawableNodes == null) {
+      return AABB();
+    }
+
     AABB aabb;
     for (final ActorDrawable drawable in _drawableNodes) {
       // This is the axis aligned bounding box in the space

diff --git a/flare_flutter/lib/flare.dart b/flare_flutter/lib/flare.dart
@@ -796,6 +796,9 @@ class FlutterActorArtboard extends ActorArtboard {
   FlutterActorArtboard(FlutterActor actor) : super(actor);
 
   void draw(ui.Canvas canvas) {
+    if (drawableNodes == null || drawableNodes.isEmpty) {
+      return;
+    }
     if (clipContents) {
       canvas.save();
       AABB aabb = artboardAABB();