Two in one:
[blender.git] / source / blender / src / toets.c
index b6f0e90ad1af5993c75b33d17bf07f79d73b7479..355a1535f42dac2242a6241bf76e74cf9f431199 100644 (file)
@@ -337,10 +337,7 @@ void persptoetsen(unsigned short event)
                if(G.vd->persp<2) perspo= G.vd->persp;
        }
 
-       if(G.vd->depths) G.vd->depths->damaged= 1;
-       retopo_queue_updates(G.vd);
-       if(retopo_mesh_paint_check() && G.vd->retopo_view_data)
-               retopo_paint_view_update(G.vd);
+       retopo_force_update();
        
        if(preview3d_event) 
                BIF_view3d_previewrender_signal(curarea, PR_DBASE|PR_DISPRECT);
@@ -453,15 +450,16 @@ int blenderqread(unsigned short event, short val)
                break;
        case F3KEY:
                if(G.qual==0) {
-                       BIF_save_rendered_image_fs(0);
+                       BIF_save_rendered_image_fs();
+                       return 0;
+               }
+               else if(G.qual==LR_SHIFTKEY) {
+                       newspace(curarea, SPACE_NODE);
                        return 0;
                }
                else if(G.qual & LR_CTRLKEY) {
                        BIF_screendump(0);
                }
-               else if(G.qual & LR_SHIFTKEY) {
-                       BIF_save_rendered_image_fs(1);
-               }
                break;
        case F4KEY:
                if(G.qual==LR_SHIFTKEY) {
@@ -470,7 +468,7 @@ int blenderqread(unsigned short event, short val)
                        ob= OBACT;
                        if(ob) strcpy(str, ob->id.name);
 
-                       activate_fileselect(FILE_MAIN, "Data Select", str, 0);
+                       activate_fileselect(FILE_MAIN, "Data Select", str, NULL);
                        return 0;
                }
                else if(G.qual==0) {
@@ -683,21 +681,6 @@ int blenderqread(unsigned short event, short val)
                                }
                        }
                }
-               else if(G.qual==LR_SHIFTKEY) {  // ??
-                       if(G.obedit)
-                               exit_editmode(EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR); // freedata, and undo
-                       if(G.f & G_FACESELECT)
-                               set_faceselect();
-                       if(G.f & G_VERTEXPAINT)
-                               set_vpaint();
-                       if(G.f & G_TEXTUREPAINT) {
-                               G.f &= ~G_TEXTUREPAINT;
-                               allqueue(REDRAWVIEW3D, 0);
-                               allqueue(REDRAWBUTSEDIT, 0);
-                       }
-                       if(G.f & G_WEIGHTPAINT)
-                               set_wpaint();
-               }
                break;
 
        case BACKSPACEKEY:
@@ -730,7 +713,8 @@ int blenderqread(unsigned short event, short val)
                break;
        case IKEY:
                if(textediting==0 && textspace==0 && !ELEM3(curarea->spacetype, SPACE_FILE, SPACE_IMASEL, SPACE_NODE)) {
-                       if(G.qual==0) {
+                       if(G.f & G_SCULPTMODE) return 1;
+                       else if(G.qual==0) {
                                common_insertkey();
                                return 0;
                        }