diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-03-02 21:15:32 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-03-02 21:15:32 +0300 |
| commit | a99495d2914088174ce0900b9360660a41d74c42 (patch) | |
| tree | 0f7f2f167ceb7250aebfe76d821de0bb60c8e20f /source/blender/editors/object | |
| parent | 5ce6388f7c2a7fed483ae3ff187063f94f139e94 (diff) | |
| parent | 42cb93205c0fc33185e56239d1dc21f0a6230e54 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/scene.c
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 271321493ef..77fd50740fc 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -2301,14 +2301,7 @@ void OBJECT_OT_laplaciandeform_bind(wmOperatorType *ot) static int surfacedeform_bind_poll(bContext *C) { - if (edit_modifier_poll_generic(C, &RNA_SurfaceDeformModifier, 0)) { - PointerRNA ptr = CTX_data_pointer_get_type(C, "modifier", &RNA_SurfaceDeformModifier); - SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)ptr.data; - - return ((smd != NULL) && (smd->target != NULL)); - } - - return 0; + return edit_modifier_poll_generic(C, &RNA_SurfaceDeformModifier, 0); } static int surfacedeform_bind_exec(bContext *C, wmOperator *op) |