Commit: 511347ff30b4fbadf943f5791a56fe30abe19209
Author: Julian Eisel
Date: Tue Apr 11 23:41:48 2017 +0200
Branches: HMD_viewport
https://developer.blender.org/rB511347ff30b4fbadf943f5791a56fe30abe19209
Remove unnecessary check
Avoids having to pass around window-manager
===================================================================
M source/blender/editors/curve/editcurve_paint.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/editors/interface/interface_eyedropper.c
M source/blender/editors/screen/area.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_draw.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/editors/curve/editcurve_paint.c
b/source/blender/editors/curve/editcurve_paint.c
index a6015550e97..6243149913d 100644
--- a/source/blender/editors/curve/editcurve_paint.c
+++ b/source/blender/editors/curve/editcurve_paint.c
@@ -1162,7 +1162,7 @@ static int curve_draw_invoke(bContext *C, wmOperator *op,
const wmEvent *event)
if ((cps->depth_mode == CURVE_PAINT_PROJECT_SURFACE) &&
(v3d->drawtype > OB_WIRE))
{
- const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_manager(C), CTX_wm_window(C));
+ const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_window(C));
view3d_get_transformation(cdd->vc.ar,
cdd->vc.rv3d, NULL, &cdd->mats);
diff --git a/source/blender/editors/gpencil/gpencil_edit.c
b/source/blender/editors/gpencil/gpencil_edit.c
index 90c89e9c250..0fa561ca3de 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -2010,7 +2010,7 @@ static int gp_strokes_reproject_exec(bContext *C,
wmOperator *op)
/* init autodist for geometry projection */
if (mode == GP_REPROJECT_SURFACE) {
- const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_manager(C), CTX_wm_window(C));
+ const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_window(C));
view3d_region_operator_needs_opengl(CTX_wm_window(C), gsc.ar);
ED_view3d_autodist_init(scene, gsc.ar, CTX_wm_view3d(C), 0,
is_hmd_view);
diff --git a/source/blender/editors/gpencil/gpencil_paint.c
b/source/blender/editors/gpencil/gpencil_paint.c
index 8e890d97342..83d60c7e509 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -114,7 +114,6 @@ typedef enum eGPencil_PaintFlags {
typedef struct tGPsdata {
Scene *scene; /* current scene from context */
- wmWindowManager *wm; /* window manager where painting originated */
wmWindow *win; /* window where painting originated */
ScrArea *sa; /* area where painting originated */
ARegion *ar; /* region where painting originated */
@@ -635,7 +634,7 @@ static short gp_stroke_addpoint(tGPsdata *p, const int
mval[2], float pressure,
*/
if (gpencil_project_check(p)) {
View3D *v3d = p->sa->spacedata.first;
- const bool is_hmd_view =
WM_window_is_hmd_view(p->wm, p->win);
+ const bool is_hmd_view =
WM_window_is_hmd_view(p->win);
view3d_region_operator_needs_opengl(p->win,
p->ar);
ED_view3d_autodist_init(p->scene, p->ar, v3d,
@@ -1240,7 +1239,7 @@ static void gp_stroke_doeraser(tGPsdata *p)
if (p->sa->spacetype == SPACE_VIEW3D) {
if (p->flags & GP_PAINTFLAG_V3D_ERASER_DEPTH) {
View3D *v3d = p->sa->spacedata.first;
- const bool is_hmd_view = WM_window_is_hmd_view(p->wm,
p->win);
+ const bool is_hmd_view = WM_window_is_hmd_view(p->win);
view3d_region_operator_needs_opengl(p->win, p->ar);
ED_view3d_autodist_init(p->scene, p->ar, v3d, 0,
is_hmd_view);
@@ -1397,7 +1396,6 @@ static bool gp_session_initdata(bContext *C, tGPsdata *p)
/* pass on context info */
p->scene = CTX_data_scene(C);
- p->wm = CTX_wm_manager(C);
p->win = CTX_wm_window(C);
unit_m4(p->imat);
@@ -1805,7 +1803,7 @@ static void gp_paint_strokeend(tGPsdata *p)
*/
if (gpencil_project_check(p)) {
View3D *v3d = p->sa->spacedata.first;
- const bool is_hmd_view = WM_window_is_hmd_view(p->wm, p->win);
+ const bool is_hmd_view = WM_window_is_hmd_view(p->win);
/* need to restore the original projection settings before
packing up */
view3d_region_operator_needs_opengl(p->win, p->ar);
diff --git a/source/blender/editors/gpencil/gpencil_utils.c
b/source/blender/editors/gpencil/gpencil_utils.c
index fa726e98f50..1ad9d4009fc 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -523,7 +523,7 @@ void gp_point_conversion_init(bContext *C,
GP_SpaceConversion *r_gsc)
Scene *scene = CTX_data_scene(C);
View3D *v3d = (View3D *)CTX_wm_space_data(C);
RegionView3D *rv3d = ar->regiondata;
- const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_manager(C), CTX_wm_window(C));
+ const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_window(C));
/* init 3d depth buffers */
view3d_operator_needs_opengl(C);
diff --git a/source/blender/editors/interface/interface_eyedropper.c
b/source/blender/editors/interface/interface_eyedropper.c
index 9d00ffa3c40..003490a3181 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -888,7 +888,7 @@ static void depthdropper_depth_sample_pt(bContext *C,
DepthDropper *ddr, int mx,
Scene *scene = win->screen->scene;
UnitSettings *unit = &scene->unit;
const bool do_split = (unit->flag & USER_UNIT_OPT_SPLIT) != 0;
- const bool is_hmd_view = WM_window_is_hmd_view(CTX_wm_manager(C), win);
+ const bool is_hmd_view = WM_window_is_hmd_view(win);
ScrArea *area_prev = CTX_wm_area(C);
ARegion *ar_prev = CTX_wm_region(C);
diff --git a/source/blender/editors/screen/area.c
b/source/blender/editors/screen/area.c
index 35c97ff070c..601debe7e89 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -473,13 +473,13 @@ void ED_region_set(const bContext *C, ARegion *ar)
ED_region_pixelspace(ar);
}
-static void region_draw_view_setup(wmWindowManager *wm, wmWindow *win, ARegion
*ar)
+static void region_draw_view_setup(wmWindow *win, ARegion *ar)
{
#ifdef WITH_INPUT_HMD
if (ar->regiontype == RGN_TYPE_TEMPORARY) {
/* pass */
}
- else if (!WM_window_is_hmd_view(wm, win)) {
+ else if (!WM_window_is_hmd_view(win)) {
/* pass */
}
else {
@@ -488,16 +488,16 @@ static void region_draw_view_setup(wmWindowManager *wm,
wmWindow *win, ARegion *
wm_subwindow_rect_set(win, ar->swinid, &ar->winrct);
}
#else
- UNUSED_VARS(wm, win, ar);
+ UNUSED_VARS(win, ar);
#endif
}
-static void region_draw_view_reset(wmWindowManager *wm, wmWindow *win, ARegion
*ar)
+static void region_draw_view_reset(wmWindow *win, ARegion *ar)
{
#ifdef WITH_INPUT_HMD
if (ar->regiontype == RGN_TYPE_TEMPORARY) {
/* pass */
}
- else if (!WM_window_is_hmd_view(wm, win)) {
+ else if (!WM_window_is_hmd_view(win)) {
/* pass */
}
else {
@@ -506,14 +506,13 @@ static void region_draw_view_reset(wmWindowManager *wm,
wmWindow *win, ARegion *
wm_subwindow_rect_set(win, ar->swinid, &ar->winrct);
}
#else
- UNUSED_VARS(wm, win, ar);
+ UNUSED_VARS(win, ar);
#endif
}
/* only exported for WM */
void ED_region_do_draw(bContext *C, ARegion *ar)
{
- wmWindowManager *wm = CTX_wm_manager(C);
wmWindow *win = CTX_wm_window(C);
ScrArea *sa = CTX_wm_area(C);
ARegionType *at = ar->type;
@@ -523,7 +522,7 @@ void ED_region_do_draw(bContext *C, ARegion *ar)
if (at->do_lock)
return;
- region_draw_view_setup(wm, win, ar);
+ region_draw_view_setup(win, ar);
/* if no partial draw rect set, full rect */
if (ar->drawrct.xmin == ar->drawrct.xmax) {
@@ -585,7 +584,7 @@ void ED_region_do_draw(bContext *C, ARegion *ar)
}
}
- region_draw_view_reset(wm, win, ar);
+ region_draw_view_reset(win, ar);
}
/* **********************************
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c
b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 04ef1774663..af564f733cc 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -5021,7 +5021,7 @@ void paint_proj_stroke(
ARegion *ar = CTX_wm_region(C);
float *cursor = ED_view3d_cursor3d_get(scene, v3d);
int mval_i[2] = {(int)pos[0], (int)pos[1]};
- const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_manager(C), CTX_wm_window(C));
+ const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_window(C));
view3d_operator_needs_opengl(C);
diff --git a/source/blender/editors/space_view3d/view3d_edit.c
b/source/blender/editors/space_view3d/view3d_edit.c
index 01119bc7d33..3aa04ee56f4 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -733,7 +733,7 @@ static void viewops_data_create_ex(bContext *C, wmOperator
*op, const wmEvent *e
else if (use_orbit_zbuf) {
Scene *scene = CTX_data_scene(C);
float fallback_depth_pt[3];
- const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_manager(C), CTX_wm_window(C));
+ const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_window(C));
view3d_operator_needs_opengl(C); /* needed for zbuf drawing */
@@ -3279,7 +3279,7 @@ static int viewcenter_pick_invoke(bContext *C, wmOperator
*op, const wmEvent *ev
if (rv3d) {
float new_ofs[3];
const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
- const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_manager(C), CTX_wm_window(C));
+ const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_window(C));
ED_view3d_smooth_view_force_finish(C, v3d, ar);
@@ -3546,7 +3546,7 @@ static int view3d_zoom_border_exec(bContext *C,
wmOperator *op)
Scene *scene = CTX_data_scene(C);
int gesture_mode;
const int smooth_viewtx = WM_operator_smooth_viewtx_get(op);
- const bool is_hmd_view = WM_window_is_hmd_view(CTX_wm_manager(C),
CTX_wm_window(C));
+ const bool is_hmd_view = WM_window_is_hmd_view(CTX_wm_window(C));
/* Zooms in on a border drawn by the user */
rcti rect;
@@ -4701,7 +4701,7 @@ void ED_view3d_cursor3d_position(bContext *C, float
fp[3], const int mval[2])
}
if (U.uiflag & USER_ZBUF_CURSOR) { /* maybe this should be accessed
some other way */
- const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_manager(C), CTX_wm_window(C));
+ const bool is_hmd_view =
WM_window_is_hmd_view(CTX_wm_window(C));
view3d_operator_needs_opengl(C);
if (ED_view3d_autodist(scene, ar, v3d, mval, fp, true,
is_hmd_view, NULL)) {
diff --git a/source/blender/editors/space_view3d/view3d_view.c
b/source/blender/editors/space_view3d/view3d_view.c
index d8883179b09..16233e054fc 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1197,7 +1197,7 @@ int view3d_opengl_select(
#ifdef WITH_INPUT_HMD
wmWindowManager *wm = G.main->wm.fi
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
