From 19935f0fc3330cc6e10a873def0f7eb06f860d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Mon, 10 Mar 2014 09:51:59 +0100 Subject: [PATCH] Fix for potential bug in copy-to-selected ui button operator: Return value was mixing operator result with an int/boolean. --- release/datafiles/locale | 2 +- release/scripts/addons | 2 +- release/scripts/addons_contrib | 2 +- scons | 2 +- source/blender/editors/interface/interface_ops.c | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/release/datafiles/locale b/release/datafiles/locale index c842f10f94d..cb1967cc63a 160000 --- a/release/datafiles/locale +++ b/release/datafiles/locale @@ -1 +1 @@ -Subproject commit c842f10f94dd7e5b8a5f28b1ece91cff3890aed3 +Subproject commit cb1967cc63a6d2d75d2b59cdf91c5f5645285aea diff --git a/release/scripts/addons b/release/scripts/addons index 8ad356e3324..c50944e808d 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 8ad356e3324cddef42d41f9b9b588ef1ebd2f8bf +Subproject commit c50944e808d6c74148237e85866e893628f0fee6 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index 7485bc6b11e..31545d25c9c 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit 7485bc6b11e32e6c9d4d13b273ec7a2d8eddf594 +Subproject commit 31545d25c9cb41d271a3f3ef84d327708572290e diff --git a/scons b/scons index 59512aadd1d..2d6ebcb2390 160000 --- a/scons +++ b/scons @@ -1 +1 @@ -Subproject commit 59512aadd1d16d7b9327f0eefafb23513b4f2137 +Subproject commit 2d6ebcb23909058b846aa232ecb2fee497924cf8 diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 370e2960709..4bbccec7f9d 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -334,7 +334,7 @@ static int copy_to_selected_button_exec(bContext *C, wmOperator *op) { PointerRNA ptr, lptr, idptr; PropertyRNA *prop, *lprop; - int success = 0; + bool success = false; int index; const bool all = RNA_boolean_get(op->ptr, "all"); @@ -349,7 +349,7 @@ static int copy_to_selected_button_exec(bContext *C, wmOperator *op) ListBase lb; if (!copy_to_selected_list(C, &ptr, &lb, &use_path)) - return success; + return OPERATOR_CANCELLED; if (!use_path || (path = RNA_path_from_ID_to_property(&ptr, prop))) { for (link = lb.first; link; link = link->next) { @@ -368,7 +368,7 @@ static int copy_to_selected_button_exec(bContext *C, wmOperator *op) if (RNA_property_editable(&lptr, lprop)) { if (RNA_property_copy(&lptr, &ptr, prop, (all) ? -1 : index)) { RNA_property_update(C, &lptr, prop); - success = 1; + success = true; } } }