Commit: 45fc0514fbf0d71b691dd69816abdbc91f718172
Author: Campbell Barton
Date: Fri Feb 28 23:45:31 2014 +1100
https://developer.blender.org/rB45fc0514fbf0d71b691dd69816abdbc91f718172
Fix for crash copying from non RNA color buttons
===================================================================
M source/blender/editors/interface/interface_handlers.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c
b/source/blender/editors/interface/interface_handlers.c
index 1702ae8..527eb9b 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
