Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-07-15 06:09:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-07-15 06:09:06 +0300
commit061d76f55cb172f9cbe133ba6a0f92ca5feb6b88 (patch)
tree24357febb8898ac85a7d89e3b6a365aab69eb374 /source/blender/editors/screen/screen_ops.c
parentd493fc43bd4aac7f2e0e448957f3ab1412d9691d (diff)
Revert "Cleanup: remove public unused function."
This reverts commit 03c8b048a166584a72ceff08432401cd7047648c. This commit re-introduced T76837. While there is a comment explaining why this function is needed, the naming of the poll function does make this confusing. The API could be changed to avoid confusion here.
Diffstat (limited to 'source/blender/editors/screen/screen_ops.c')
-rw-r--r--source/blender/editors/screen/screen_ops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 1555dce8b79..b034fb186d2 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -349,7 +349,7 @@ bool ED_operator_object_active(bContext *C)
return ((ob != NULL) && !ed_object_hidden(ob));
}
-static bool operator_object_active_editable_ex(const Object *ob)
+bool ED_operator_object_active_editable_ex(bContext *UNUSED(C), const Object *ob)
{
return ((ob != NULL) && !ID_IS_LINKED(ob) && !ed_object_hidden(ob));
}
@@ -357,14 +357,14 @@ static bool operator_object_active_editable_ex(const Object *ob)
bool ED_operator_object_active_editable(bContext *C)
{
Object *ob = ED_object_active_context(C);
- return operator_object_active_editable_ex(ob);
+ return ED_operator_object_active_editable_ex(C, ob);
}
/** Object must be editable and fully local (i.e. not an override). */
bool ED_operator_object_active_local_editable(bContext *C)
{
Object *ob = ED_object_active_context(C);
- return operator_object_active_editable_ex(ob) && !ID_IS_OVERRIDE_LIBRARY(ob);
+ return ED_operator_object_active_editable_ex(C, ob) && !ID_IS_OVERRIDE_LIBRARY(ob);
}
bool ED_operator_object_active_editable_mesh(bContext *C)