Fixed crash on async painting with no default Tileset (#1047)

deepnight · Jan 15, 2024 · 78e2fcf · 78e2fcf
1 parent 124bcb3
commit 78e2fcf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/electron.renderer/data/def/LayerDef.hx b/src/electron.renderer/data/def/LayerDef.hx
@@ -467,10 +467,6 @@ class LayerDef {
 	inline function set_tilePivotX(v) return tilePivotX = dn.M.fclamp(v, 0, 1);
 	inline function set_tilePivotY(v) return tilePivotY = dn.M.fclamp(v, 0, 1);
 
-	public inline function getGridTileColor(tileId:Int) : dn.Col {
-		return _project.defs.getTilesetDef(tilesetDefUid).getAverageTileColor(tileId);
-	}
-
 
 	public inline function isAutoLayer() {
 		return type==IntGrid && tilesetDefUid!=null || type==AutoLayer;

diff --git a/src/electron.renderer/data/inst/LayerInstance.hx b/src/electron.renderer/data/inst/LayerInstance.hx
@@ -737,6 +737,10 @@ class LayerInstance {
 
 
 	/** TILES *******************/
+	inline function getGridTileColor(tileId:Int) : dn.Col {
+		var td = _project.defs.getTilesetDef( getTilesetUid() );
+		return td!=null ? td.getAverageTileColor(tileId) : White;
+	}
 
 	public function addGridTile(cx:Int, cy:Int, tileId:Null<Int>, flips=0, stack:Bool, useAsyncRender=true) {
 		if( !isValid(cx,cy) )
@@ -755,7 +759,7 @@ class LayerInstance {
 		}
 
 		if( useAsyncRender )
-			asyncPaint(cx,cy, def.getGridTileColor(tileId));
+			asyncPaint(cx,cy, getGridTileColor(tileId));
 	}