[Bf-blender-cvs] [e53d4327878] HMD_viewport: Sync with master and minor formatting
Campbell Barton
noreply at git.blender.org
Sun Apr 2 18:51:47 CEST 2017
Commit: e53d43278786b51ea19bf165e1c77e2f7bdf1cba
Author: Campbell Barton
Date: Mon Apr 3 02:50:56 2017 +1000
Branches: HMD_viewport
https://developer.blender.org/rBe53d43278786b51ea19bf165e1c77e2f7bdf1cba
Sync with master and minor formatting
===================================================================
M source/blender/blenkernel/intern/camera.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_camera_control.c
M source/blender/gpu/intern/gpu_compositing.c
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_camera.c
M source/blender/windowmanager/intern/wm_stereo.c
===================================================================
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index 6199e0e1109..c70a5916195 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -687,7 +687,7 @@ static void camera_stereo3d_model_matrix(
float fac_signed;
const float interocular_distance = interocular_distance_override == -1.0f ?
- data->stereo.interocular_distance : interocular_distance_override;
+ data->stereo.interocular_distance : interocular_distance_override;
const short convergence_mode = data->stereo.convergence_mode;
const short pivot = data->stereo.pivot;
@@ -779,8 +779,9 @@ void BKE_camera_multiview_view_matrix(
RenderData *rd, Object *camera, const bool is_left, const float interocular_distance_override,
float r_viewmat[4][4])
{
- BKE_camera_multiview_model_matrix_ex(rd, camera, is_left ? STEREO_LEFT_NAME : STEREO_RIGHT_NAME,
- interocular_distance_override, r_viewmat);
+ BKE_camera_multiview_model_matrix_ex(
+ rd, camera, is_left ? STEREO_LEFT_NAME : STEREO_RIGHT_NAME,
+ interocular_distance_override, r_viewmat);
invert_m4(r_viewmat);
}
@@ -938,7 +939,7 @@ float BKE_camera_multiview_shift_x(RenderData *rd, Object *camera, const char *v
if (!is_multiview) {
return data->shiftx;
}
- else if (ELEM(rd->views_format, SCE_VIEWS_FORMAT_MULTIVIEW)) {
+ else if (rd->views_format == SCE_VIEWS_FORMAT_MULTIVIEW) {
return data->shiftx;
}
else { /* SCE_VIEWS_SETUP_BASIC */
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 15daba376db..1d58fe1ea41 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2926,6 +2926,7 @@ static void write_screen(WriteData *wd, bScreen *sc)
if (v3d->localvd) {
writestruct(wd, DATA, View3D, 1, v3d->localvd);
}
+
if (v3d->fx_settings.ssao) {
writestruct(wd, DATA, GPUSSAOSettings, 1, v3d->fx_settings.ssao);
}
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index f81d534833c..6139ebb261f 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -454,7 +454,7 @@ static void view3d_init(wmWindowManager *wm, ScrArea *sa)
/* Make sure the HMD view is initialized with the shader set in UserPrefs. */
if (is_hmd_view && v3d->fx_settings.lensdist) {
- v3d->fx_settings.fx_flag |= GPU_FX_FLAG_LensDist;
+ v3d->fx_settings.fx_flag |= GPU_FX_FLAG_LensDist;
}
#else
UNUSED_VARS(wm, sa);
diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c b/source/blender/editors/space_view3d/view3d_camera_control.c
index 59e94f7a5b3..ef385266dac 100644
--- a/source/blender/editors/space_view3d/view3d_camera_control.c
+++ b/source/blender/editors/space_view3d/view3d_camera_control.c
@@ -305,7 +305,7 @@ void ED_view3d_cameracontrol_release(
/* Non Camera we need to reset the view back to the original location bacause the user canceled*/
copy_qt_qt(rv3d->viewquat, vctrl->rot_backup);
rv3d->persp = ((rv3d->viewlock & RV3D_LOCK_PERSP_VIEW) && vctrl != RV3D_ORTHO) ?
- vctrl->persp_backup : RV3D_PERSP;
+ vctrl->persp_backup : RV3D_PERSP;
}
/* always, is set to zero otherwise */
copy_v3_v3(rv3d->ofs, vctrl->ofs_backup);
diff --git a/source/blender/gpu/intern/gpu_compositing.c b/source/blender/gpu/intern/gpu_compositing.c
index 9d34327ca55..e13812c5a5c 100644
--- a/source/blender/gpu/intern/gpu_compositing.c
+++ b/source/blender/gpu/intern/gpu_compositing.c
@@ -727,6 +727,7 @@ void GPU_fx_compositor_XRay_resolve(GPUFX *fx)
glPopAttrib();
}
+
bool GPU_fx_do_composite_pass(
GPUFX *fx, float projmat[4][4], bool is_persp,
struct Scene *scene, struct GPUOffScreen *ofs,
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 766ad882e3f..918d0f00040 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1712,11 +1712,11 @@ typedef struct Scene {
/* flag */
/* use preview range */
-#define SCER_PRV_RANGE (1 << 0)
-#define SCER_LOCK_FRAME_SELECTION (1 << 1)
+#define SCER_PRV_RANGE (1<<0)
+#define SCER_LOCK_FRAME_SELECTION (1<<1)
/* timeline/keyframe jumping - only selected items (on by default) */
-#define SCE_KEYS_NO_SELONLY (1 << 2)
-#define SCER_SHOW_SUBFRAME (1 << 3)
+#define SCE_KEYS_NO_SELONLY (1<<2)
+#define SCER_SHOW_SUBFRAME (1<<3)
/* mode (int now) */
#define R_OSA 0x0001
diff --git a/source/blender/makesrna/intern/rna_camera.c b/source/blender/makesrna/intern/rna_camera.c
index 8470668afbf..078ba13d76d 100644
--- a/source/blender/makesrna/intern/rna_camera.c
+++ b/source/blender/makesrna/intern/rna_camera.c
@@ -42,8 +42,6 @@
#include "BKE_object.h"
#include "BKE_depsgraph.h"
-#include "WM_api.h"
-
static float rna_Camera_angle_get(PointerRNA *ptr)
{
Camera *cam = ptr->id.data;
diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c
index 037f6456c37..c3faf29dce4 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -288,7 +288,6 @@ static void wm_method_draw_stereo3d_topbottom(wmWindow *win)
void wm_method_draw_stereo3d(wmWindow *win)
{
-
switch (win->stereo3d_format->display_mode) {
case S3D_DISPLAY_ANAGLYPH:
wm_method_draw_stereo3d_anaglyph(win);
More information about the Bf-blender-cvs
mailing list