Skip to content

Commit

Permalink
-Fixed ui issue in CurveTool's 3D_View panel where the slider would n…
Browse files Browse the repository at this point in the history
…ot show up over the selected tool button
  • Loading branch information
aresdevo committed Feb 15, 2022
1 parent b986555 commit 9e24e91
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"name": "AnimAide",
"description": "Helpful tools to manipulate keys on f-curves",
"author": "Ares Deveaux",
"version": (1, 0, 36),
"version": (1, 0, 37),
"blender": (2, 92, 0),
"location": "Graph Editor - Dope Sheet - Timeline - 3D View - sidebar and menu bar",
"warning": "This addon is still in development.",
Expand Down
4 changes: 2 additions & 2 deletions curve_tools/ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,6 @@ def invoke(self, context, event):
if self.op_context == 'EXEC_DEFAULT':
return self.execute(context)

tool.selector = self.tool_type

tool.factor = 0.0
tool.factor_overshoot = 0.0
# self.slope = tool.slope
Expand All @@ -193,8 +191,10 @@ def invoke(self, context, event):
tool.area = context.area.type

if context.area.type == 'VIEW_3D':
tool.selector_3d = self.tool_type
tool.unselected_fcurves = True
else:
tool.selector = self.tool_type
tool.unselected_fcurves = False

# left_frame, right_frame = support.set_ref_marker(context)
Expand Down
19 changes: 10 additions & 9 deletions curve_tools/ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ def blend_button(layout, fac, text='', icon='NONE'):
op.factor = fac


def reference_frames(context, layout, expand):
tool = context.scene.animaide.tool
def reference_frames(context, layout, selector):
# tool = context.scene.animaide.tool

if tool.selector == 'BLEND_FRAME':
if selector == 'BLEND_FRAME':

row = layout.row(align=True)
# row.label(text='Referece frames:')
Expand Down Expand Up @@ -245,12 +245,13 @@ def draw(self, context):

if context.area.type == 'GRAPH_EDITOR':
layout.prop(tool, 'sticky_handles', text='Sticky handles')

if tool.selector == 'TIME_OFFSET':

layout.prop(clone, 'cycle', text='Cicle Options')

reference_frames(context, layout, expand)
if tool.selector == 'TIME_OFFSET':
layout.prop(clone, 'cycle', text='Cicle Options')
reference_frames(context, layout, tool.selector)
else:
if tool.selector_3d == 'TIME_OFFSET':
layout.prop(clone, 'cycle', text='Cicle Options')
reference_frames(context, layout, tool.selector_3d)


class ANIMAIDE_PT_curve_tools_ge(Panel, ANIMAIDE_PT_curve_tools):
Expand Down

0 comments on commit 9e24e91

Please sign in to comment.