ps
/
Lumenarium
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed extraneous files, and fixed an error introduced in the merge

This commit is contained in:
PS 2020-11-15 17:23:17 -08:00
parent 70971cc196
commit aac3ce5f00
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/editor/panels/foldhaus_panel_animation_timeline.h
View File

@ -240,8 +240,8 @@ SelectAndBeginDragAnimationBlock(animation_timeline_state* TimelineState, handle
animation* ActiveAnim = AnimationSystem_GetActiveAnimation(&State->AnimationSystem); animation* ActiveAnim = AnimationSystem_GetActiveAnimation(&State->AnimationSystem);
operation_mode* DragAnimationBlockMode = ActivateOperationModeWithCommands(&State->Modes, DragAnimationBlockCommands, UpdateDragAnimationBlock); operation_mode* DragAnimationBlockMode = ActivateOperationModeWithCommands(&State->Modes, DragAnimationBlockCommands, UpdateDragAnimationBlock);
animation_block* SelectedBlock = Animation_GetBlockFromHandle(ActiveAnim, BlockHandle);
drag_animation_block_state* OpState = CreateOperationState(DragAnimationBlockMode, drag_animation_block_state* OpState = CreateOperationState(DragAnimationBlockMode,
&State->Modes, &State->Modes,
drag_animation_block_state); drag_animation_block_state);
OpState->TimelineBounds = TimelineBounds; OpState->TimelineBounds = TimelineBounds;
@ -591,7 +591,7 @@ DrawAnimationPatternList(rect2 PanelBounds, ui_interface* Interface, u32 Selecte
{ {
animation_pattern Pattern = GlobalAnimationPatterns[i]; animation_pattern Pattern = GlobalAnimationPatterns[i];
gs_string PatternName = MakeString(Pattern.Name, Pattern.NameLength); gs_string PatternName = MakeString(Pattern.Name, Pattern.NameLength);
if (ui_LayoutListEntry(Interface, &Layout, PatternName, i)) if (ui_Button(Interface, PatternName))
{ {
AddAnimationBlockAtCurrentTime(i + 1, SelectedAnimationLayerHandle, AnimationSystem); AddAnimationBlockAtCurrentTime(i + 1, SelectedAnimationLayerHandle, AnimationSystem);
} }