From a738586810d077fb98dc5c4d2f0fd4a71dd489d7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 17 Sep 2018 12:16:27 +0200 Subject: Fix object selection with eyerdropper not respecting property poll function. --- source/blender/editors/interface/interface_eyedropper_datablock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/interface/interface_eyedropper_datablock.c') diff --git a/source/blender/editors/interface/interface_eyedropper_datablock.c b/source/blender/editors/interface/interface_eyedropper_datablock.c index 2bb575558fc..43ccd65ddf2 100644 --- a/source/blender/editors/interface/interface_eyedropper_datablock.c +++ b/source/blender/editors/interface/interface_eyedropper_datablock.c @@ -190,7 +190,10 @@ static void datadropper_id_sample_pt(bContext *C, DataDropper *ddr, int mx, int } } - if (id) { + PointerRNA idptr; + RNA_id_pointer_create(id, &idptr); + + if (id && RNA_property_pointer_poll(&ddr->ptr, ddr->prop, &idptr)) { BLI_snprintf(ddr->name, sizeof(ddr->name), "%s: %s", ddr->idcode_name, id->name + 2); *r_id = id; -- cgit v1.2.3