Commit: c3b1c5d026f7a20a7d6bc3d910198c791ff2e9ea
Author: Julian Eisel
Date: Wed Mar 16 16:09:39 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rBc3b1c5d026f7a20a7d6bc3d910198c791ff2e9ea
Merge remote-tracking branch 'github/vr_experiments' into HMD_viewport
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/readfile.c
index 8b41c61,84260b1..9aec728
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -6931,7 -6932,10 +6931,10 @@@ static bool direct_link_screen(FileDat
v3d->fx_settings.dof = newdataadr(fd,
v3d->fx_settings.dof);
if (v3d->fx_settings.ssao)
v3d->fx_settings.ssao = newdataadr(fd,
v3d->fx_settings.ssao);
+ if (v3d->fx_settings.lens_dist)
+ v3d->fx_settings.lens_dist =
newdataadr(fd, v3d->fx_settings.lens_dist);
+
-
+
blo_do_versions_view3d_split_250(v3d,
&sl->regionbase);
}
else if (sl->spacetype == SPACE_IPO) {
diff --cc source/blender/editors/space_view3d/view3d_draw.c
index 1b6435f,b943774..7f63d64
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -4047,8 -4051,12 +4051,12 @@@ void view3d_main_region_draw(const bCon
#endif
if (G.debug & G_DEBUG_SIMDATA)
draw_sim_debug_data(scene, v3d, ar);
-
+
ED_region_pixelspace(ar);
+
+ if (HMD_view) {
+ return;
+ }
}
/* draw viewport using external renderer */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
