diff options
| author | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
|---|---|---|
| committer | Severin <eiseljulian@gmail.com> | 2018-07-02 15:50:45 +0300 |
| commit | 5a17c9bcbca737525fa535ceb45f9769a34a4df7 (patch) | |
| tree | c7867d25494d053d11837d04b1ab8b86526a189d /source/blender/editors/object/object_relations.c | |
| parent | 9887b38692e3bcf7ba613ca947fd76e299c58cbd (diff) | |
| parent | 20046defd735684a42750c4cb68d20d78ad5180c (diff) | |
Merge branch 'blender2.8' into temp-tab_drag_droptemp-tab_drag_drop
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 8db58b17520..324b6eca34a 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -118,7 +118,7 @@ /*********************** Make Vertex Parent Operator ************************/ -static int vertex_parent_set_poll(bContext *C) +static bool vertex_parent_set_poll(bContext *C) { return ED_operator_editmesh(C) || ED_operator_editsurfcurve(C) || ED_operator_editlattice(C); } @@ -2387,7 +2387,7 @@ static int make_override_static_exec(bContext *C, wmOperator *op) return success ? OPERATOR_FINISHED : OPERATOR_CANCELLED; } -static int make_override_static_poll(bContext *C) +static bool make_override_static_poll(bContext *C) { Object *obact = CTX_data_active_object(C); |