merging trunk 17520:19093
authorMartin Poirier <theeth@yahoo.com>
Mon, 23 Feb 2009 21:00:42 +0000 (21:00 +0000)
committerMartin Poirier <theeth@yahoo.com>
Mon, 23 Feb 2009 21:00:42 +0000 (21:00 +0000)
12 files changed:
1  2 
source/blender/blenkernel/BKE_global.h
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/intern/arithb.c
source/blender/blenlib/intern/graph.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_scene_types.h
source/blender/src/buttons_editing.c
source/blender/src/drawview.c
source/blender/src/header_view3d.c
source/blender/src/space.c
source/blender/src/usiblender.c
source/blender/src/view.c

Simple merge
Simple merge
@@@ -7970,40 -8009,17 +7972,43 @@@ static void do_versions(FileData *fd, L
                }
        }
        
 -      if (main->versionfile < 248 || (main->versionfile == 248 && main->subversionfile < 2)) {
 +      if (main->versionfile < 248 || main->subversionfile < 2)
 +      {
                Scene *sce;
                
-               /* initialize skeleton generation toolsettings */
 -              /* Note, these will need to be added for painting */
 -              for (sce= main->scene.first; sce; sce= sce->id.next) {
 +              for(sce=main->scene.first; sce; sce = sce->id.next)
 +              {
++                      /* Note, these will need to be added for painting */
+                       sce->toolsettings->imapaint.seam_bleed = 2;
+                       sce->toolsettings->imapaint.normal_angle = 80;
++
++                      /* initialize skeleton generation toolsettings */
 +                      sce->toolsettings->skgen_resolution = 250;
 +                      sce->toolsettings->skgen_threshold_internal     = 0.1f;
 +                      sce->toolsettings->skgen_threshold_external     = 0.1f;
 +                      sce->toolsettings->skgen_angle_limit                    = 30.0f;
 +                      sce->toolsettings->skgen_length_ratio                   = 1.3f;
 +                      sce->toolsettings->skgen_length_limit                   = 1.5f;
 +                      sce->toolsettings->skgen_correlation_limit              = 0.98f;
 +                      sce->toolsettings->skgen_symmetry_limit                 = 0.1f;
 +                      sce->toolsettings->skgen_postpro = SKGEN_SMOOTH;
 +                      sce->toolsettings->skgen_postpro_passes = 3;
 +                      sce->toolsettings->skgen_options = SKGEN_FILTER_INTERNAL|SKGEN_FILTER_EXTERNAL|SKGEN_FILTER_SMART|SKGEN_SUB_CORRELATION|SKGEN_HARMONIC;
 +                      sce->toolsettings->skgen_subdivisions[0] = SKGEN_SUB_CORRELATION;
 +                      sce->toolsettings->skgen_subdivisions[1] = SKGEN_SUB_LENGTH;
 +                      sce->toolsettings->skgen_subdivisions[2] = SKGEN_SUB_ANGLE;
 +
 +                      
 +                      sce->toolsettings->skgen_retarget_angle_weight = 1.0f;
 +                      sce->toolsettings->skgen_retarget_length_weight = 1.0f;
 +                      sce->toolsettings->skgen_retarget_distance_weight = 1.0f;
 +      
 +                      /* Skeleton Sketching */
 +                      sce->toolsettings->bone_sketching = 0;
 +                      sce->toolsettings->skgen_retarget_roll = SK_RETARGET_ROLL_VIEW;
                }
        }
 -      
 -      
 +
-       
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! */
        /* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */
  
Simple merge
Simple merge
Simple merge
@@@ -1254,14 -1263,6 +1265,7 @@@ static void winqreadview3dspace(ScrAre
                 * - grease-pencil also defaults to leftmouse
                 */
                if(event==LEFTMOUSE) {
- #ifndef DISABLE_PYTHON
-                       /* run any view3d event handler script links */
-                       if (sa->scriptlink.totscript) {
-                               if (BPY_do_spacehandlers(sa, event, val, SPACEHANDLER_VIEW3D_EVENT))
-                                       return; /* return if event was processed (swallowed) by handler(s) */
-                       }
- #endif
 +                      if(BIF_paintSketch(LEFTMOUSE)) return;
                        if(gpencil_do_paint(sa, L_MOUSE)) return;
                        if(BIF_do_manipulator(sa)) return;
                }
                                        }
                                }
                        }
+                       else if (!G.obedit && OBACT && G.f&G_TEXTUREPAINT){
+                               if(G.scene->toolsettings->imapaint.brush &&
+                                       event!=LEFTMOUSE && event!=RIGHTMOUSE && event!=MIDDLEMOUSE &&
+                                       (event==MOUSEY || event==MOUSEX) && bwin_qtest(sa->win)==0) {
+                                       allqueue(REDRAWVIEW3D, 0);
+                               }
+                       }
                        
 +                      BDR_queueDrawSketch();
  
                        /* Handle retopo painting */
                        if(retopo_mesh_paint_check()) {
Simple merge
Simple merge