summaryrefslogtreecommitdiff
path: root/createcalls.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'createcalls.cpp')
-rw-r--r--createcalls.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/createcalls.cpp b/createcalls.cpp
index 12fb2de..b6ce7e1 100644
--- a/createcalls.cpp
+++ b/createcalls.cpp
@@ -214,7 +214,8 @@ Bezier_EvaluateValue(project_state *State, bezier_point *PointAddress, v2 *Pos,
if (PointAddress->IsSelected) {
if (State->Interact_Active == interact_type_keyframe_move) {
Pos[PointAddress->IsSelected - 1].x += (int32)State->Interact_Offset[0];
- Pos[PointAddress->IsSelected - 1].y -= (State->Interact_Offset[1] / GraphZoomHeight / Y_Increment);
+ if (State->Interact_Modifier != 1)
+ Pos[PointAddress->IsSelected - 1].y -= (State->Interact_Offset[1] / GraphZoomHeight / Y_Increment);
} else if (State->Interact_Active == interact_type_keyframe_scale) {
Pos[1].x += State->Interact_Offset[0];
Pos[2].x -= State->Interact_Offset[0];
@@ -901,8 +902,8 @@ void Source_UICreateButton(project_data *File, project_state *State, memory *Mem
}
block_layer *Layer = Layer_Init(File, Memory);
Layer->Block_Source_Index = i;
- Layer->x.CurrentValue = Source->Width / 2;
- Layer->y.CurrentValue = Source->Height / 2;
+ Layer->x.CurrentValue = Comp->Width/2;
+ Layer->y.CurrentValue = Comp->Height/2;
Layer->Vertical_Offset = TopOffset-1;
Layer->Frame_Start = Comp->Frame_Start;
Layer->Frame_End = Comp->Frame_End;
@@ -1100,8 +1101,7 @@ void Bitmap_SwapData(uint8 *Address_0, uint8 *Address_1, uint64 Size, uint16 Byt
#if NEON
Assert(InstructionMode != instruction_mode_neon);
-#endif
-
+#else
if (BytesPerPixel == 4) {
uint32 Temp = 0;
while (i < Size) {
@@ -1146,6 +1146,8 @@ void Bitmap_SwapData(uint8 *Address_0, uint8 *Address_1, uint64 Size, uint16 Byt
} else {
Assert(0);
}
+#endif
+
}
@@ -1219,6 +1221,8 @@ PaintTest(brush_info B, void *Buffer, rectangle RenderRegion)
}
}
+#if ARM
+#else
static void
PaintTest_AVX2(brush_info B, void *Buffer, rectangle RenderRegion)
{
@@ -1300,7 +1304,7 @@ Brush_Render(project_state *State, ui *UI, layer_transforms T_Layer, block_compo
PaintTest(B, BitmapAddress, B.LayerBounds);
}
}
-
+#endif
#if 0