diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2019-08-10 11:20:30 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2019-08-10 11:20:30 +0300 |
commit | 77516c25e48d77bf2593b4dd13ef74e3737d0502 (patch) | |
tree | 3fb4bb51dec167d32b44c5a14acffdf336ce889e /source/blender | |
parent | a571ff2c16c61baeb0cb55c0d6346adc0e958781 (diff) |
GPencil: Fix segment fault using Search menu
The poll was not checking Object type
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 01b62dce3c2..f3ab0b45122 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -4575,7 +4575,7 @@ bool ED_object_gpencil_exit(struct Main *bmain, Object *ob) static bool gp_merge_by_distance_poll(bContext *C) { Object *ob = CTX_data_active_object(C); - if (ob == NULL) { + if ((ob == NULL) || (ob->type != OB_GPENCIL)) { return false; } bGPdata *gpd = (bGPdata *)ob->data; |