Page MenuHome
Files F9436

pad0.patch
Public
Actions

pad0.patch
View Options

Index: source/blender/makesdna/DNA_view3d_types.h
===================================================================
--- source/blender/makesdna/DNA_view3d_types.h (revision 17087)
+++ source/blender/makesdna/DNA_view3d_types.h (working copy)
@@ -148,7 +148,7 @@
/* last view */
float lviewquat[4];
short lpersp, lview;
- short lastview_set;
+ short lastview_set;//is not used
short pad5;
} View3D;
Index: source/blender/src/header_view3d.c
===================================================================
--- source/blender/src/header_view3d.c (revision 17087)
+++ source/blender/src/header_view3d.c (working copy)
@@ -212,6 +212,14 @@
persptoetsen(PAD0);
G.qual &= ~LR_CTRLKEY;
} else {
+
+ /* store settings of current view before allowing overwriting with camera view */
+ if(G.vd->persp != V3D_CAMOB) {
+ QUATCOPY(G.vd->lviewquat, G.vd->viewquat);
+ G.vd->lview= G.vd->view;
+ G.vd->lpersp= G.vd->persp;
+ }
+
for( base = FIRSTBASE; base; base = base->next ) {
if (base->object->type == OB_CAMERA) {
i++;
Index: source/blender/src/toets.c
===================================================================
--- source/blender/src/toets.c (revision 17087)
+++ source/blender/src/toets.c (working copy)
@@ -292,17 +292,15 @@
}
else if(event==PAD0) {
/* lastview - */
- if(G.vd->lastview_set==0) {
+ if(G.vd->persp != V3D_CAMOB) {
/* store settings of current view before allowing overwriting with camera view */
QUATCOPY(G.vd->lviewquat, G.vd->viewquat);
G.vd->lview= G.vd->view;
G.vd->lpersp= G.vd->persp;
- G.vd->lastview_set= 1;
}
else {
/* return to settings of last view */
axis_set_view(G.vd->lviewquat[0], G.vd->lviewquat[1], G.vd->lviewquat[2], G.vd->lviewquat[3], G.vd->lview, G.vd->lpersp);
- G.vd->lastview_set= 0;
}
if(G.qual==LR_ALTKEY) {
Index: source/blender/src/view.c
===================================================================
--- source/blender/src/view.c (revision 17087)
+++ source/blender/src/view.c (working copy)
@@ -894,11 +894,6 @@
return;
}
- /* clear lastview flag (used to return to previous view when
- * pressing Pad0 again after entering Camera view)
- */
- if (G.vd->lastview_set) G.vd->lastview_set= 0;
-
// dist correction from other movement devices
if((dz_flag)||G.vd->dist==0) {
dz_flag = 0;

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
5e/95/811dafd16cff5d0f1a8405d05643

Event Timeline