forked from bartvdbraak/blender
Fix eyedropper with quad-view
This commit is contained in:
parent
52b9d83417
commit
68fe630735
@ -176,8 +176,8 @@ static void eyedropper_color_sample_fl(bContext *C, Eyedropper *UNUSED(eye), int
|
||||
|
||||
if (sa) {
|
||||
if (sa->spacetype == SPACE_IMAGE) {
|
||||
ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
|
||||
if (ar && BLI_rcti_isect_pt(&ar->winrct, mx, my)) {
|
||||
ARegion *ar = BKE_area_find_region_xy(sa, RGN_TYPE_WINDOW, mx, my);
|
||||
if (ar) {
|
||||
SpaceImage *sima = sa->spacedata.first;
|
||||
int mval[2] = {mx - ar->winrct.xmin,
|
||||
my - ar->winrct.ymin};
|
||||
@ -188,8 +188,8 @@ static void eyedropper_color_sample_fl(bContext *C, Eyedropper *UNUSED(eye), int
|
||||
}
|
||||
}
|
||||
else if (sa->spacetype == SPACE_NODE) {
|
||||
ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
|
||||
if (ar && BLI_rcti_isect_pt(&ar->winrct, mx, my)) {
|
||||
ARegion *ar = BKE_area_find_region_xy(sa, RGN_TYPE_WINDOW, mx, my);
|
||||
if (ar) {
|
||||
SpaceNode *snode = sa->spacedata.first;
|
||||
int mval[2] = {mx - ar->winrct.xmin,
|
||||
my - ar->winrct.ymin};
|
||||
@ -200,8 +200,8 @@ static void eyedropper_color_sample_fl(bContext *C, Eyedropper *UNUSED(eye), int
|
||||
}
|
||||
}
|
||||
else if (sa->spacetype == SPACE_CLIP) {
|
||||
ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
|
||||
if (ar && BLI_rcti_isect_pt(&ar->winrct, mx, my)) {
|
||||
ARegion *ar = BKE_area_find_region_xy(sa, RGN_TYPE_WINDOW, mx, my);
|
||||
if (ar) {
|
||||
SpaceClip *sc = sa->spacedata.first;
|
||||
int mval[2] = {mx - ar->winrct.xmin,
|
||||
my - ar->winrct.ymin};
|
||||
@ -484,8 +484,8 @@ static void datadropper_id_sample_pt(bContext *C, DataDropper *ddr, int mx, int
|
||||
|
||||
if (sa) {
|
||||
if (sa->spacetype == SPACE_VIEW3D) {
|
||||
ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
|
||||
if (ar && BLI_rcti_isect_pt(&ar->winrct, mx, my)) {
|
||||
ARegion *ar = BKE_area_find_region_xy(sa, RGN_TYPE_WINDOW, mx, my);
|
||||
if (ar) {
|
||||
const int mval[2] = {
|
||||
mx - ar->winrct.xmin,
|
||||
my - ar->winrct.ymin};
|
||||
@ -767,8 +767,8 @@ static void depthdropper_depth_sample_pt(bContext *C, DepthDropper *ddr, int mx,
|
||||
|
||||
if (sa) {
|
||||
if (sa->spacetype == SPACE_VIEW3D) {
|
||||
ARegion *ar = BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
|
||||
if (ar && BLI_rcti_isect_pt(&ar->winrct, mx, my)) {
|
||||
ARegion *ar = BKE_area_find_region_xy(sa, RGN_TYPE_WINDOW, mx, my);
|
||||
if (ar) {
|
||||
View3D *v3d = sa->spacedata.first;
|
||||
RegionView3D *rv3d = ar->regiondata;
|
||||
/* weak, we could pass in some reference point */
|
||||
|
Loading…
Reference in New Issue
Block a user