diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-09-24 00:26:03 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-09-24 00:26:03 +0400 |
| commit | 63746ac4f731fb03cffd67e199aca5b49d6ecf4a (patch) | |
| tree | 00bd131ac0dd5e46250688d52464a8fcfc9548fe /source/blender/editors/interface | |
| parent | 1199551239ed0832e2784718a49ecda1c2614303 (diff) | |
Fix #22947: sample color tool not working in user preferences, was assuming the
color to be a property on an ID block. Note that sampling from another window
still does not work, only within the same window.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_anim.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_ops.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c index c99622c7518..0e4de9fabaa 100644 --- a/source/blender/editors/interface/interface_anim.c +++ b/source/blender/editors/interface/interface_anim.c @@ -127,7 +127,7 @@ void uiAnimContextProperty(const bContext *C, struct PointerRNA *ptr, struct Pro if(ar) { for(block=ar->uiblocks.first; block; block=block->next) { for(but=block->buttons.first; but; but= but->next) { - if((but->active || but->flag & UI_BUT_LAST_ACTIVE) && but->rnapoin.id.data) { + if((but->active || but->flag & UI_BUT_LAST_ACTIVE) && but->rnapoin.data) { *ptr= but->rnapoin; *prop= but->rnaprop; *index= but->rnaindex; diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index caee3c1c2fe..f0f69e06299 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -230,7 +230,7 @@ static int copy_data_path_button_exec(bContext *C, wmOperator *op) /* try to create driver using property retrieved from UI */ uiAnimContextProperty(C, &ptr, &prop, &index); - if (ptr.data && prop) { + if (ptr.id.data && ptr.data && prop) { path= RNA_path_from_ID_to_property(&ptr, prop); if (path) { |