Merge pull request #1046 from tsoding/704

[nothing.git] / src / game / level / level_editor / rect_layer.c

diff --git a/src/game/level/level_editor/rect_layer.c b/src/game/level/level_editor/rect_layer.c
index 13600845016c3bb4040c5c6201ed26374a49f503..d392a286b479bda52a64ae82f6714c8cfa3ec4b9 100644 (file)
--- a/src/game/level/level_editor/rect_layer.c
+++ b/src/game/level/level_editor/rect_layer.c
@@ -13,12 +13,10 @@
 #include "ui/edit_field.h"
 #include "undo_history.h"
 
-#define RECT_LAYER_ID_MAX_SIZE 36
 #define RECT_LAYER_SELECTION_THICCNESS 10.0f
 #define RECT_LAYER_ID_LABEL_SIZE vec(3.0f, 3.0f)
 #define CREATE_AREA_THRESHOLD 10.0
 
-
 typedef enum {
     RECT_LAYER_IDLE = 0,
     RECT_LAYER_CREATE,
@@ -212,9 +210,11 @@ static int rect_layer_event_idle(RectLayer *layer,
         return -1;
     }
 
-    if (color_changed && layer->selection >= 0) {
-        dynarray_copy_to(layer->colors, &layer->inter_color, (size_t)layer->selection);
-        layer->state = RECT_LAYER_RECOLOR;
+    if (color_changed) {
+        if (layer->selection >= 0) {
+            dynarray_copy_to(layer->colors, &layer->inter_color, (size_t)layer->selection);
+            layer->state = RECT_LAYER_RECOLOR;
+        }
         return 0;
     }
 
@@ -592,7 +592,7 @@ int rect_layer_render(const RectLayer *layer, Camera *camera, int active)
         }
 
         // Selection Overlay
-        if ((size_t) layer->selection == i) {
+        if (active && (size_t) layer->selection == i) {
             const Rect overlay_rect =
                 rect_scale(
                     camera_rect(camera, rect),