diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2011-03-25 00:07:54 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2011-03-25 00:07:54 +0300 |
| commit | 70d7884792e883f8d7093b6c74e9d9936084884f (patch) | |
| tree | f13fa629db42a4c72a1e35535cafbf0623b6f414 /source | |
| parent | 22ea604c6f877f36747b9e07b0459ee20cf6b0e5 (diff) | |
Logic Editor UI: sensor frequency active only when one of the triggers is on. Removing text "Action" from Action and Shape Action Actuators.
I still would love to see a change in the action actuators (Action, Shape and FCurve) even if only a rename or unifying them in a single actuator (I do have some patch for that). Anyways
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index ae4303f91a4..8cbe56c852f 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -3228,7 +3228,7 @@ static void draw_sensor_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *lo static void draw_sensor_internal_header(uiLayout *layout, PointerRNA *ptr) { - uiLayout *box, *split, *row; + uiLayout *box, *split, *subrow, *row; box= uiLayoutBox(layout); split = uiLayoutSplit(box, 0.45, 0); @@ -3236,7 +3236,11 @@ static void draw_sensor_internal_header(uiLayout *layout, PointerRNA *ptr) row= uiLayoutRow(split, 1); uiItemR(row, ptr, "use_pulse_true_level", 0, "", ICON_DOTSUP); uiItemR(row, ptr, "use_pulse_false_level", 0, "", ICON_DOTSDOWN); - uiItemR(row, ptr, "frequency", 0, "Freq", ICON_NONE); + + subrow=uiLayoutRow(row, 0); + uiLayoutSetActive(subrow, (RNA_boolean_get(ptr, "use_pulse_true_level") + || RNA_boolean_get(ptr, "use_pulse_false_level"))); + uiItemR(subrow, ptr, "frequency", 0, "Freq", ICON_NONE); row= uiLayoutRow(split, 1); uiItemR(row, ptr, "use_level", UI_ITEM_R_TOGGLE, NULL, ICON_NONE); @@ -3683,7 +3687,7 @@ static void draw_actuator_action(uiLayout *layout, PointerRNA *ptr) row= uiLayoutRow(layout, 0); uiItemR(row, ptr, "play_mode", 0, "", ICON_NONE); - uiItemR(row, ptr, "action", 0, NULL, ICON_NONE); + uiItemR(row, ptr, "action", 0, "", ICON_NONE); uiItemR(row, ptr, "use_continue_last_frame", 0, NULL, ICON_NONE); row= uiLayoutRow(layout, 0); @@ -4275,7 +4279,7 @@ static void draw_actuator_shape_action(uiLayout *layout, PointerRNA *ptr) row= uiLayoutRow(layout, 0); uiItemR(row, ptr, "mode", 0, "", ICON_NONE); - uiItemR(row, ptr, "action", 0, NULL, ICON_NONE); + uiItemR(row, ptr, "action", 0, "", ICON_NONE); uiItemR(row, ptr, "use_continue_last_frame", 0, NULL, ICON_NONE); row= uiLayoutRow(layout, 0); |