diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-10 12:51:59 +0400 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-03-10 12:51:59 +0400 |
commit | 19935f0fc3330cc6e10a873def0f7eb06f860d96 (patch) | |
tree | f99d8f3516d38b36c427a0b13841f4086d0e59ee | |
parent | 99e20d7b8930479edfacae246a529e03b84264ae (diff) |
Fix for potential bug in copy-to-selected ui button operator: Return
value was mixing operator result with an int/boolean.
m--------- | release/datafiles/locale | 0 | ||||
m--------- | release/scripts/addons | 0 | ||||
m--------- | release/scripts/addons_contrib | 0 | ||||
m--------- | scons | 0 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_ops.c | 6 |
5 files changed, 3 insertions, 3 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject c842f10f94dd7e5b8a5f28b1ece91cff3890aed +Subproject cb1967cc63a6d2d75d2b59cdf91c5f5645285ae diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 8ad356e3324cddef42d41f9b9b588ef1ebd2f8b +Subproject c50944e808d6c74148237e85866e893628f0fee diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject 7485bc6b11e32e6c9d4d13b273ec7a2d8eddf59 +Subproject 31545d25c9cb41d271a3f3ef84d327708572290 diff --git a/scons b/scons -Subproject 59512aadd1d16d7b9327f0eefafb23513b4f213 +Subproject 2d6ebcb23909058b846aa232ecb2fee497924cf 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; } } } |