diff options
author | Fox Caminiti <fox@foxcam.net> | 2023-01-24 20:16:31 -0500 |
---|---|---|
committer | Fox Caminiti <fox@foxcam.net> | 2023-01-24 20:16:31 -0500 |
commit | 4261c7342d92ab259d563fcf96180905c112ec96 (patch) | |
tree | b30a67fc8acfb8e2229743c8816d23690b5124fd /src/main.cpp | |
parent | e4acc91f56d9d88b75f60a23bd9662804d7c54b7 (diff) |
functioning smart boxing??
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 3f8388e..d1e992a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,6 +21,8 @@ uint32 BitmapFill = 0x00000001; #include <curl/curl.h> #endif +static real32 aaa; + #if SPECIAL #else #include "memory.cpp" @@ -420,10 +422,10 @@ Render_UI(project_data *File, project_state *State, memory *Memory, ui *UI, ImDr layer_transforms T = Layer_GetTransforms(Layer); if (State->Interact_Active == interact_type_viewport_transform && Layer->IsSelected == 1) { - Transform_ApplyInteractive(*(interact_transform *)&State->Interact_Offset[0], &T.x, &T.y, &T.rotation, &T.scale); + Transform_ApplyInteractive(State->Interact_Transform, &T.x, &T.y, &T.rotation, &T.scale); } if (State->Interact_Active == interact_type_viewport_transform_gizmo && Layer->IsSelected == 1) { - Transform_ApplyInteractive(*(interact_transform *)&State->Interact_Offset[0], &T.x, &T.y, &T.rotation, &T.scale); + Transform_ApplyInteractive(State->Interact_Transform, &T.x, &T.y, &T.rotation, &T.scale); } if (State->Interact_Active == interact_type_viewport_slide && Layer->IsSelected == 1) { // Transform_ApplySlide((v2 *)&State->Interact_Offset[0], &T); @@ -1057,6 +1059,7 @@ int main(int argc, char *argv[]) { { History_Undo(&Memory); Memory_Cache_Purge(File, State, &Memory); + State->Interact_Transform = {}; State->UpdateFrame = true; State->UpdateKeyframes = true; } break; @@ -1064,6 +1067,7 @@ int main(int argc, char *argv[]) { { History_Redo(&Memory); Memory_Cache_Purge(File, State, &Memory); + State->Interact_Transform = {}; State->UpdateFrame = true; State->UpdateKeyframes = true; } break; |