From 2e8fa57f7cbcade4a4dc7cc1bde908d44959d570 Mon Sep 17 00:00:00 2001
From: Charlie Groves <charlie@threerings.net>
Date: Wed, 14 May 2008 06:32:22 +0000
Subject: [PATCH] If edits are being made to blocks that are offscreen, just
 edit the model directly instead of going through the scene block

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@596 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../stage/tools/editor/EditorScenePanel.java  | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/java/com/threerings/stage/tools/editor/EditorScenePanel.java b/src/java/com/threerings/stage/tools/editor/EditorScenePanel.java
index d3c594d1..7b16287c 100644
--- a/src/java/com/threerings/stage/tools/editor/EditorScenePanel.java
+++ b/src/java/com/threerings/stage/tools/editor/EditorScenePanel.java
@@ -578,12 +578,18 @@ public class EditorScenePanel extends StageScenePanel
         if (!_model.setBaseTile(fqTileId, x, y)) {
             return false;
         }
-        getBlock(x, y).updateBaseTile(fqTileId, x, y);
+        SceneBlock block = getBlock(x, y);
+        if (block != null && block.isResolved()) {
+            block.updateBaseTile(fqTileId, x, y);
+        }
 
         // and recompute any surrounding fringe
-        for (int fx = x-1, xn = x+1; fx <= xn; fx++) {
-            for (int fy = y-1, yn = y+1; fy <= yn; fy++) {
-                getBlock(fx, fy).updateFringe(fx, fy);
+        for (int fx = x - 1, xn = x + 1; fx <= xn; fx++) {
+            for (int fy = y - 1, yn = y + 1; fy <= yn; fy++) {
+                block = getBlock(fx, fy);
+                if (block != null && block.isResolved()) {
+                    block.updateFringe(fx, fy);
+                }
             }
         }
         return true;
@@ -626,12 +632,14 @@ public class EditorScenePanel extends StageScenePanel
         // first attempt to add it to the appropriate scene block; this
         // will fail if there's already a copy of the same object at this
         // coordinate
-        if (getBlock(oinfo.x, oinfo.y).addObject(oinfo)) {
+        SceneBlock block = getBlock(oinfo.x, oinfo.y);
+        if (block== null || !block.isResolved() || block.addObject(oinfo)) {
             // create an object info and add it to the scene model
-            _model.addObject(oinfo);
-            // recompute our visible object set
-            recomputeVisible();
-            return oinfo;
+            if (_model.addObject(oinfo)) {
+                // recompute our visible object set
+                recomputeVisible();
+                return oinfo;
+            }
         }
         return null;
     }
@@ -664,7 +672,10 @@ public class EditorScenePanel extends StageScenePanel
         // remove it from the scene model
         if (_model.removeObject(info)) {
             // clear the object out of its block
-            getBlock(info.x, info.y).deleteObject(info);
+            SceneBlock block = getBlock(info.x, info.y);
+            if (block != null && block.isResolved()) {
+                block.deleteObject(info);
+            }
 
             // recompute our visible object set
             recomputeVisible();