* Grease Pencil - changed defaulted for sensitivity userprefs. Will overwrite old...
authorJoshua Leung <aligorith@gmail.com>
Sun, 5 Oct 2008 12:06:55 +0000 (12:06 +0000)
committerJoshua Leung <aligorith@gmail.com>
Sun, 5 Oct 2008 12:06:55 +0000 (12:06 +0000)
* Removed some unneeded funcs (compiler warnings)

source/blender/src/edit.c
source/blender/src/editsound.c
source/blender/src/usiblender.c

index 87bb6f9e94ebbbdeb67a206410ed07d4535a6d9e..a80e7b6c3602a34aa38410d744ca35b10a267164 100644 (file)
@@ -138,8 +138,6 @@ extern void uvedit_selectionCB(short selecting, Object *editobj,
 
 static void circle_selectCB(select_CBfunc func);
 
-/* local protos ---------------*/
-static void snap_curs_to_firstsel(void);
 
 /* flag==2 only border, flag==3 cross+border
    flag==5 cross + border + start&end frame
@@ -1548,72 +1546,6 @@ void snap_curs_to_active()
        allqueue(REDRAWVIEW3D, 0);
 }
 
-static void snap_curs_to_firstsel()
-{
-       TransVert *tv;
-       Base *base;
-       float *curs, bmat[3][3], vec[3], min[3], max[3], centroid[3];
-       int count;
-
-       curs= give_cursor();
-
-       count= 0;
-       INIT_MINMAX(min, max);
-       centroid[0]= centroid[1]= centroid[2]= 0.0;
-
-       if(G.obedit) {
-               tottrans=0;
-               
-               if ELEM6(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) 
-                       make_trans_verts(bmat[0], bmat[1], 0);
-               if(tottrans==0) return;
-               
-               Mat3CpyMat4(bmat, G.obedit->obmat);
-               
-               tv= transvmain;
-               VECCOPY(vec, tv->loc);
-                       /*Mat3MulVecfl(bmat, vec);
-                       VecAddf(vec, vec, G.obedit->obmat[3]);
-                       VecAddf(centroid, centroid, vec);
-                       DO_MINMAX(vec, min, max);*/
-               
-               if(G.vd->around==V3D_CENTROID) {
-                       VecMulf(vec, 1.0/(float)tottrans);
-                       VECCOPY(curs, vec);
-               }
-               else {
-                       curs[0]= vec[0];
-                       curs[1]= vec[1];
-                       curs[2]= vec[2];
-               }
-               MEM_freeN(transvmain);
-               transvmain= 0;
-       }
-       else {
-               base= (G.scene->base.first);
-               while(base) {
-                       if(((base)->flag & SELECT) && ((base)->lay & G.vd->lay) ) {
-                               VECCOPY(vec, base->object->obmat[3]);
-                               VecAddf(centroid, centroid, vec);
-                               DO_MINMAX(vec, min, max);
-                               count++;
-                       }
-                       base= base->next;
-               }
-               if(count) {
-                       if(G.vd->around==V3D_CENTROID) {
-                               VecMulf(centroid, 1.0/(float)count);
-                               VECCOPY(curs, centroid);
-                       }
-                       else {
-                               curs[0]= (min[0]+max[0])/2;
-                               curs[1]= (min[1]+max[1])/2;
-                               curs[2]= (min[2]+max[2])/2;
-                       }
-               }
-       }
-       allqueue(REDRAWVIEW3D, 0);
-}
 
 void snap_to_center()
 {
index c6ecc8d58650fffeb81e696ac22d8a9311a75ea0..95b3a3d30214046e0428040bf2c64fc3f19527fe 100644 (file)
@@ -95,7 +95,7 @@ static SND_SceneHandle ghSoundScene=NULL;
 static SND_AudioDeviceInterfaceHandle ghAudioDeviceInterface=NULL;
 
 /* que? why only here? because of the type define? */
-static bSound *sound_find_sound(char *id_name);
+//static bSound *sound_find_sound(char *id_name);
 static void sound_read_wav_data(bSound * sound, PackedFile * pf);
 void winqreadsoundspace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt);
 /*  void sound_stop_all_sounds(void); already in BIF_editsound.h */
@@ -1022,7 +1022,7 @@ void sound_play_sound(bSound *sound)
 }
 
 
-
+#if 0
 static bSound *sound_find_sound(char *id_name)
 {
        bSound *sound;
@@ -1039,6 +1039,7 @@ static bSound *sound_find_sound(char *id_name)
        
        return sound;
 }
+#endif
 
 void sound_init_audio(void)
 {
index c4d22664b8edf45264684d317ed6bf9f04719015..7fdc672596436946586f18f53cb413a3e16f3475 100644 (file)
@@ -504,10 +504,11 @@ static void init_userdef_file(void)
                        col = btheme->tv3d.vertex_select;
                        SETCOL(btheme->tseq.vertex_select, col[0], col[1], col[2], 255);
                }
-               
+       }
+       if ((G.main->versionfile < 247) || (G.main->versionfile == 247 && G.main->subversionfile <= 9)) {
                /* define grease-pencil distances */
-               U.gp_manhattendist= 3;
-               U.gp_euclideandist= 20;
+               U.gp_manhattendist= 2;
+               U.gp_euclideandist= 15;
        }
 
        /* GL Texture Garbage Collection (variable abused above!) */