diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-03-31 13:13:34 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-03-31 13:14:27 +0300 |
| commit | e5fa738ce972460e0c1053400c00af226086b1ee (patch) | |
| tree | 75c605cb6648e4d7dd5cc29b8492f7cdb508c64e | |
| parent | 4b7d95290f4d7ecf90e0c8e63b47137a0526430f (diff) | |
UI cleanup: simplify Icon handling of uiDefAutoButR for PROP_POINTER.
Comes from D113, but really not related to the patch's topic!
| -rw-r--r-- | source/blender/editors/interface/interface_utils.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index df6f098ee81..636b7e4e9ce 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -127,12 +127,10 @@ uiBut *uiDefAutoButR(uiBlock *block, PointerRNA *ptr, PropertyRNA *prop, int ind break; case PROP_POINTER: { - PointerRNA pptr; - - pptr = RNA_property_pointer_get(ptr, prop); - if (!pptr.type) - pptr.type = RNA_property_pointer_type(ptr, prop); - icon = RNA_struct_ui_icon(pptr.type); + if (icon == 0) { + PointerRNA pptr = RNA_property_pointer_get(ptr, prop); + icon = RNA_struct_ui_icon(pptr.type ? pptr.type : RNA_property_pointer_type(ptr, prop)); + } if (icon == ICON_DOT) icon = 0; |