[Bf-blender-cvs] [a738586810d] master: Fix object selection with eyerdropper not respecting property poll function.

Brecht Van Lommel noreply at git.blender.org
Mon Sep 17 12:37:12 CEST 2018


Commit: a738586810d077fb98dc5c4d2f0fd4a71dd489d7
Author: Brecht Van Lommel
Date:   Mon Sep 17 12:16:27 2018 +0200
Branches: master
https://developer.blender.org/rBa738586810d077fb98dc5c4d2f0fd4a71dd489d7

Fix object selection with eyerdropper not respecting property poll function.

===================================================================

M	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;



More information about the Bf-blender-cvs mailing list