Commit: b3cdca4a0ac9bb912f2c9c9e7481121e61d55b9d
Author: Julian Eisel
Date: Wed Apr 12 00:04:11 2017 +0200
Branches: HMD_viewport
https://developer.blender.org/rBb3cdca4a0ac9bb912f2c9c9e7481121e61d55b9d
Cleanup: Naming, use util function
===================================================================
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_draw.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/makesrna/intern/rna_wm.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_operators.c
M source/blender/windowmanager/intern/wm_window.c
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/source/blender/editors/curve/editcurve_paint.c
b/source/blender/editors/curve/editcurve_paint.c
index 6243149913d..6c496914143 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_window(C));
+ const bool is_hmd_view =
WM_window_is_running_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 0fa561ca3de..de0d79b5a64 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_window(C));
+ const bool is_hmd_view =
WM_window_is_running_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 83d60c7e509..5068bad4f9c 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -634,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->win);
+ const bool is_hmd_view =
WM_window_is_running_hmd_view(p->win);
view3d_region_operator_needs_opengl(p->win,
p->ar);
ED_view3d_autodist_init(p->scene, p->ar, v3d,
@@ -1239,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->win);
+ const bool is_hmd_view =
WM_window_is_running_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);
@@ -1803,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->win);
+ const bool is_hmd_view = WM_window_is_running_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 1ad9d4009fc..8123d2f9b1b 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_window(C));
+ const bool is_hmd_view =
WM_window_is_running_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 003490a3181..ab2c7389c08 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(win);
+ const bool is_hmd_view = WM_window_is_running_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 601debe7e89..0dcfcdb4e02 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -479,7 +479,7 @@ static void region_draw_view_setup(wmWindow *win, ARegion
*ar)
if (ar->regiontype == RGN_TYPE_TEMPORARY) {
/* pass */
}
- else if (!WM_window_is_hmd_view(win)) {
+ else if (!WM_window_is_running_hmd_view(win)) {
/* pass */
}
else {
@@ -497,7 +497,7 @@ static void region_draw_view_reset(wmWindow *win, ARegion
*ar)
if (ar->regiontype == RGN_TYPE_TEMPORARY) {
/* pass */
}
- else if (!WM_window_is_hmd_view(win)) {
+ else if (!WM_window_is_running_hmd_view(win)) {
/* pass */
}
else {
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c
b/source/blender/editors/sculpt_paint/paint_image_proj.c
index af564f733cc..7328feb241b 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_window(C));
+ const bool is_hmd_view =
WM_window_is_running_hmd_view(CTX_wm_window(C));
view3d_operator_needs_opengl(C);
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index 22f13c1edf6..20ea82fe567 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3762,15 +3762,10 @@ enum HMDViewMatrixType {
HMD_MATRIX_CENTER,
};
-static bool view3d_is_hmd_view(wmWindowManager *wm, wmWindow *win)
-{
- return ((wm->hmd_view.hmd_win == win) &&
(wm->hmd_view.hmd_win->screen->is_hmd_running));
-}
-
bool view3d_is_hmd_view_mirror(const wmWindowManager *wm, const View3D *v3d,
const RegionView3D *rv3d)
{
return wm->hmd_view.hmd_win &&
- wm->hmd_view.hmd_win->screen->is_hmd_running &&
+ WM_window_is_running_hmd_view(wm->hmd_view.hmd_win) &&
(v3d->flag3 & V3D_SHOW_HMD_MIRROR) &&
RV3D_IS_LOCKED_SHARED(rv3d);
}
@@ -4047,7 +4042,7 @@ static void view3d_main_region_draw_objects(
/* setup the view matrix */
#ifdef WITH_INPUT_HMD
- if (view3d_is_hmd_view(wm, win)) {
+ if (WM_window_is_running_hmd_view(win)) {
view3d_hmd_view_setup(scene, v3d, ar);
}
else if (view3d_is_hmd_view_mirror(wm, v3d, rv3d)) {
@@ -4105,13 +4100,13 @@ static void view3d_main_region_draw_objects(
/* post process */
if (do_compositing) {
const bool is_left = v3d->multiview_eye == STEREO_LEFT_ID;
-#ifdef WITH_INPUT_HMD
void *hmd_distortion_params =
- (wm->hmd_view.hmd_win == win &&
win->screen->is_hmd_running) ?
- WM_device_HMD_distortion_parameters_get() : NULL;
+#ifdef WITH_INPUT_HMD
+ WM_window_is_running_hmd_view(win) ?
WM_device_HMD_distortion_parameters_get() : NULL;
#else
- void *hmd_distortion_params = NULL;
+ NULL;
#endif
+
GPU_fx_do_composite_pass(
rv3d->compositor, rv3d->winmat, rv3d->is_persp, scene,
NULL, is_left, hmd_distortion_params);
}
@@ -4182,10 +4177,9 @@ static void view3d_main_region_draw_info(const bContext
*C, Scene *scene,
if (rv3d->persp == RV3D_CAMOB) {
#ifdef WITH_INPUT_HMD
- if (!view3d_is_hmd_view(wm, CTX_wm_window(C))) {
-#else
- {
+ if (!WM_window_is_running_hmd_view(CTX_wm_window(C)))
#endif
+ {
drawviewborder(scene, ar, v3d);
}
}
diff --git a/source/blender/editors/space_view3d/view3d_edit.c
b/source/blender/editors/space_view3d/view3d_edit.c
index 3aa04ee56f4..a9c1795f691 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_window(C));
+ const bool is_hmd_view =
WM_window_is_running_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_window(C));
+ const bool is_hmd_view =
WM_window_is_running_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_window(C));
+ const bool is_hmd_view =
WM_window_is_running_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_window(C));
+ const bool is_hmd_view =
WM_window_is_running_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 16233e054fc..7ed6a6f3be1 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_I
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
