summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/all.h2
-rw-r--r--src/include/main.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/include/all.h b/src/include/all.h
index 8182b26..4382d17 100644
--- a/src/include/all.h
+++ b/src/include/all.h
@@ -526,7 +526,7 @@ static void
Transform_ApplyInteractive(interact_transform Interact, real32 *OutputX, real32 *OutputY, real32 *OutputRotation, real32 *OutputScale);
static void
-LayerIterate(project_state *State, memory *Memory, uint32 CompIndex, layer_transforms ExtraT, v2 Center,
+LayerIterate(project_state *State, memory *Memory, uint32 CompIndex, interact_transform Interact_Transform, layer_transforms ExtraT, v2 Center,
sorted_comp_array *SortedCompArray, sorted_layer_array *SortedLayerArray);
static void
diff --git a/src/include/main.h b/src/include/main.h
index 8debbb0..375d8da 100644
--- a/src/include/main.h
+++ b/src/include/main.h
@@ -441,6 +441,7 @@ struct gl_viewport_data
ImVec2 UIPos;
ImVec2 UIZoom;
real32 UIScale;
+ v4 BGColor;
gl_data *LayerEntry[MAX_LAYERS];
int LayerCount;
};
@@ -563,6 +564,7 @@ struct project_state
selection_type RecentSelectionType = selection_type_none;
interact_transform Interact_Transform;
+ interact_transform Interact_Transform_Prev;
interact_type Interact_Active;
int32 Interact_Modifier;
bool32 Interact_OutOfDrag; // TODO(fox): replace this
@@ -612,6 +614,7 @@ struct project_state
focused_window FocusedWindow; // Convenience for adding window-specific hotkeys.
bool32 SetFocus;
v2 LastClickedPoint = V2(1, 1);
+
};
// UI info that's saved to the file and is not part of the history tree
@@ -632,6 +635,7 @@ struct ui
v4 Color = {1, 1, 1, 1};
v4 AltColor = {0, 0, 0, 1};
bool32 IsPrimary;
+ v4 BGColor = {0, 0, 0, 1};
#if STABLE
sd_state SD;