diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-09-25 18:32:26 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-09-25 18:32:26 +0400 |
| commit | 58082beda937b05cb2aa42e4f9f0b801a3e8663d (patch) | |
| tree | 0d396166631478123871c7cbdcbd6d20db0c7c81 /source/blender/editors/interface/interface_ops.c | |
| parent | cd429bdb505d7ef05503bd1b60960df8f9b849a1 (diff) | |
Fix #23847: keyframe insert on button not working in popup menus, e.g.
the vector popup for node inputs.
Diffstat (limited to 'source/blender/editors/interface/interface_ops.c')
| -rw-r--r-- | source/blender/editors/interface/interface_ops.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index f0f69e06299..bcde54f473a 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -68,7 +68,7 @@ static int eyedropper_init(bContext *C, wmOperator *op) op->customdata= eye= MEM_callocN(sizeof(Eyedropper), "Eyedropper"); - uiAnimContextProperty(C, &eye->ptr, &eye->prop, &eye->index); + uiContextActiveProperty(C, &eye->ptr, &eye->prop, &eye->index); return (eye->ptr.data && eye->prop && RNA_property_editable(&eye->ptr, eye->prop)); } @@ -228,7 +228,7 @@ static int copy_data_path_button_exec(bContext *C, wmOperator *op) int index; /* try to create driver using property retrieved from UI */ - uiAnimContextProperty(C, &ptr, &prop, &index); + uiContextActiveProperty(C, &ptr, &prop, &index); if (ptr.id.data && ptr.data && prop) { path= RNA_path_from_ID_to_property(&ptr, prop); @@ -266,7 +266,7 @@ static int reset_default_button_poll(bContext *C) PropertyRNA *prop; int index; - uiAnimContextProperty(C, &ptr, &prop, &index); + uiContextActiveProperty(C, &ptr, &prop, &index); return (ptr.data && prop && RNA_property_editable(&ptr, prop)); } @@ -279,7 +279,7 @@ static int reset_default_button_exec(bContext *C, wmOperator *op) int index, all = RNA_boolean_get(op->ptr, "all"); /* try to reset the nominated setting to its default value */ - uiAnimContextProperty(C, &ptr, &prop, &index); + uiContextActiveProperty(C, &ptr, &prop, &index); /* if there is a valid property that is editable... */ if (ptr.data && prop && RNA_property_editable(&ptr, prop)) { @@ -335,7 +335,7 @@ static int copy_to_selected_button_poll(bContext *C) PropertyRNA *prop; int index, success= 0; - uiAnimContextProperty(C, &ptr, &prop, &index); + uiContextActiveProperty(C, &ptr, &prop, &index); if (ptr.data && prop) { CollectionPointerLink *link; @@ -361,7 +361,7 @@ static int copy_to_selected_button_exec(bContext *C, wmOperator *op) int index, all = RNA_boolean_get(op->ptr, "all"); /* try to reset the nominated setting to its default value */ - uiAnimContextProperty(C, &ptr, &prop, &index); + uiContextActiveProperty(C, &ptr, &prop, &index); /* if there is a valid property that is editable... */ if (ptr.data && prop) { |