diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-17 20:40:39 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-17 20:40:39 +0300 |
| commit | 91e87f5cf28c035eca59ab645747d1d2854571a5 (patch) | |
| tree | 055a8830745e691b6ea857094bb1c6e21212ea2b /source/blender/editors/interface/interface_eyedropper_datablock.c | |
| parent | 731d0d8d0f499d8eb8a21ae12d0d5a6c61f1a37a (diff) | |
| parent | 39c18c54136323fbf56e667fdb1f1345c7d0f89b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface_eyedropper_datablock.c')
| -rw-r--r-- | source/blender/editors/interface/interface_eyedropper_datablock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper_datablock.c b/source/blender/editors/interface/interface_eyedropper_datablock.c index b1e649f4abe..781032ef971 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; |