diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-28 16:45:31 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-28 16:45:31 +0400 |
| commit | 45fc0514fbf0d71b691dd69816abdbc91f718172 (patch) | |
| tree | e4535f1ac5dc0a5f1dc3533db8bedaef07a71efa | |
| parent | a04c132a7efe09846aad1b68e0f604e9a3ff3156 (diff) | |
Fix for crash copying from non RNA color buttons
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 1702ae8bf1a..527eb9b966b 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1754,7 +1754,7 @@ static void ui_but_copy_paste(bContext *C, uiBut *but, uiHandleButtonData *data, /* pass */ } else if (mode == 'c') { - if (RNA_property_array_length(&but->rnapoin, but->rnaprop) == 4) + if (but->rnaprop && RNA_property_array_length(&but->rnapoin, but->rnaprop) == 4) rgba[3] = RNA_property_float_get_index(&but->rnapoin, but->rnaprop, 3); else rgba[3] = 1.0f; @@ -1776,7 +1776,7 @@ static void ui_but_copy_paste(bContext *C, uiBut *but, uiHandleButtonData *data, button_activate_state(C, but, BUTTON_STATE_NUM_EDITING); ui_set_but_vectorf(but, rgba); - if (RNA_property_array_length(&but->rnapoin, but->rnaprop) == 4) + if (but->rnaprop && RNA_property_array_length(&but->rnapoin, but->rnaprop) == 4) RNA_property_float_set_index(&but->rnapoin, but->rnaprop, 3, rgba[3]); button_activate_state(C, but, BUTTON_STATE_EXIT); |