Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / interface / interface_eyedropper.c
index 5f69079402834cacacc4e687673616e7b5afa30b..40fbb673c62f2a08b1b3fd44cd41b009ffc5833f 100644 (file)
@@ -841,7 +841,7 @@ static int depthdropper_init(bContext *C, wmOperator *op)
                RegionView3D *rv3d = CTX_wm_region_view3d(C);
                if (rv3d && rv3d->persp == RV3D_CAMOB) {
                        View3D *v3d = CTX_wm_view3d(C);
-                       if (v3d->camera && v3d->camera->data && !ID_IS_LINKED_DATABLOCK(v3d->camera->data)) {
+                       if (v3d->camera && v3d->camera->data && !ID_IS_LINKED(v3d->camera->data)) {
                                RNA_id_pointer_create(v3d->camera->data, &ddr->ptr);
                                ddr->prop = RNA_struct_find_property(&ddr->ptr, "dof_distance");
                        }
@@ -1095,7 +1095,7 @@ static int depthdropper_poll(bContext *C)
                RegionView3D *rv3d = CTX_wm_region_view3d(C);
                if (rv3d && rv3d->persp == RV3D_CAMOB) {
                        View3D *v3d = CTX_wm_view3d(C);
-                       if (v3d->camera && v3d->camera->data && !ID_IS_LINKED_DATABLOCK(v3d->camera->data)) {
+                       if (v3d->camera && v3d->camera->data && !ID_IS_LINKED(v3d->camera->data)) {
                                return 1;
                        }
                }