Revision: 17166 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17166 Author: pidhash Date: 2008-10-22 07:33:45 +0200 (Wed, 22 Oct 2008)
Log Message: ----------- Modified Paths: -------------- trunk/blender/source/blender/makesdna/DNA_view3d_types.h trunk/blender/source/blender/src/header_view3d.c trunk/blender/source/blender/src/toets.c trunk/blender/source/blender/src/view.c trunk/blender/source/nan_definitions.mk Modified: trunk/blender/source/blender/makesdna/DNA_view3d_types.h =================================================================== --- trunk/blender/source/blender/makesdna/DNA_view3d_types.h 2008-10-22 05:24:41 UTC (rev 17165) +++ trunk/blender/source/blender/makesdna/DNA_view3d_types.h 2008-10-22 05:33:45 UTC (rev 17166) @@ -148,8 +148,8 @@ /* last view */ float lviewquat[4]; short lpersp, lview; - short lastview_set; - short pad5; + + short pad5, pad6; } View3D; Modified: trunk/blender/source/blender/src/header_view3d.c =================================================================== --- trunk/blender/source/blender/src/header_view3d.c 2008-10-22 05:24:41 UTC (rev 17165) +++ trunk/blender/source/blender/src/header_view3d.c 2008-10-22 05:33:45 UTC (rev 17166) @@ -212,6 +212,14 @@ persptoetsen(PAD0); G.qual &= ~LR_CTRLKEY; } else { + /* store settings of current view before allowing overwriting with camera view */ + /* this is a copy of the code in toets.c */ + 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++; Modified: trunk/blender/source/blender/src/toets.c =================================================================== --- trunk/blender/source/blender/src/toets.c 2008-10-22 05:24:41 UTC (rev 17165) +++ trunk/blender/source/blender/src/toets.c 2008-10-22 05:33:45 UTC (rev 17166) @@ -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) { Modified: trunk/blender/source/blender/src/view.c =================================================================== --- trunk/blender/source/blender/src/view.c 2008-10-22 05:24:41 UTC (rev 17165) +++ trunk/blender/source/blender/src/view.c 2008-10-22 05:33:45 UTC (rev 17166) @@ -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; Modified: trunk/blender/source/nan_definitions.mk =================================================================== --- trunk/blender/source/nan_definitions.mk 2008-10-22 05:24:41 UTC (rev 17165) +++ trunk/blender/source/nan_definitions.mk 2008-10-22 05:33:45 UTC (rev 17166) @@ -413,10 +413,10 @@ export NAN_PARANOID ?= true # l10n - export INTERNATIONAL ?= true + export INTERNATIONAL ?= false # enable freetype2 support for text objects - export WITH_FREETYPE2 ?= true + export WITH_FREETYPE2 ?= false export WITH_BINRELOC ?= true _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs