(no commit message)
authorJoilnen Leite <joilnen.leite@gmail.com>
Wed, 22 Oct 2008 05:33:45 +0000 (05:33 +0000)
committerJoilnen Leite <joilnen.leite@gmail.com>
Wed, 22 Oct 2008 05:33:45 +0000 (05:33 +0000)
source/blender/makesdna/DNA_view3d_types.h
source/blender/src/header_view3d.c
source/blender/src/toets.c
source/blender/src/view.c
source/nan_definitions.mk

index ae0dcfc3f0eeb6d65d0af5c78d740d4425367f06..b7b5f71c84530c04f104f9bf13c4a21d11cc523c 100644 (file)
@@ -148,8 +148,8 @@ typedef struct View3D {
        /* last view */
        float lviewquat[4];
        short lpersp, lview;
-       short lastview_set;
-       short pad5;
+
+       short pad5, pad6;
 } View3D;
 
 
index 5c215dcdd46153b938f3c10044c5045a94005f60..d57fa18a7055ea98feb8ae70aa2d76ce89b96eb7 100644 (file)
@@ -212,6 +212,14 @@ static void do_view3d_view_camerasmenu(void *arg, int event)
                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++;
index 162d652afd13b3bde7e1f41847de769d6e69c2bf..804660c34336b62b9ac752df890dc8ca6a2671c0 100644 (file)
@@ -292,17 +292,15 @@ void persptoetsen(unsigned short event)
                }
                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 e7b46d83b509a29a97b2693c447c4d66f45f3ac7..258e4fd99e08cadf84a339d0ae513d90ed4e64d2 100644 (file)
@@ -894,11 +894,6 @@ void viewmove(int mode)
                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;
index 424a7c558d7993bc26a34b2c175e05123c8623fe..eccb0c08bc500619466dfa8da049eaa9614ab253 100644 (file)
@@ -413,10 +413,10 @@ endif
     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