diff options
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/makesdna/DNA_actuator_types.h | 1 | ||||
| -rw-r--r-- | source/blender/src/buttons_logic.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h index 0af1ec0a2c7..43dada97d0e 100644 --- a/source/blender/makesdna/DNA_actuator_types.h +++ b/source/blender/makesdna/DNA_actuator_types.h @@ -113,6 +113,7 @@ typedef struct bIpoActuator { short flag, type; int sta, end; char name[32]; + char frameProp[32]; /* Set this property to the actions current frame */ short pad1, cur, butsta, butend; diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c index 052bf3f1ae4..a54f20b85c2 100644 --- a/source/blender/src/buttons_logic.c +++ b/source/blender/src/buttons_logic.c @@ -1866,7 +1866,7 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh { ia= act->data; - ysize= 52; + ysize= 72; glRects(xco, yco-ysize, xco+width, yco); uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1); @@ -1915,6 +1915,10 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh "Child", xco+10+(width-80), yco-44, 60, 19, &ia->flag, 0, 0, 0, 0, "Update IPO on all children Objects as well"); + uiDefBut(block, TEX, 0, + "FrameProp: ", xco+10, yco-64, width-20, 19, + ia->frameProp, 0.0, 31.0, 0, 0, + "Assign this property this action current frame number"); yco-= ysize; break; |