merging trunk 17221:17300
authorMartin Poirier <theeth@yahoo.com>
Sun, 2 Nov 2008 19:44:18 +0000 (19:44 +0000)
committerMartin Poirier <theeth@yahoo.com>
Sun, 2 Nov 2008 19:44:18 +0000 (19:44 +0000)
1  2 
source/blender/src/buttons_editing.c

index 26c0496f1070aba73da8919f9aea928d7c4536ed,6cbf14d47fb7dbce901e156c415d618cad4c7bb2..46b833fb6493be5ffb40a47c02ceff8dc26e54ab
@@@ -5246,6 -5246,7 +5246,6 @@@ static void editing_panel_mesh_skgen_re
        uiDefButF(block, NUM, B_DIFF,                                                   "Ang:",                 1025, 40, 83,19, &G.scene->toolsettings->skgen_retarget_angle_weight, 0, 10, 1, 0,              "Angle Weight");
        uiDefButF(block, NUM, B_DIFF,                                                   "Len:",                 1108, 40, 83,19, &G.scene->toolsettings->skgen_retarget_length_weight, 0, 10, 1, 0,             "Length Weight");
        uiDefButF(block, NUM, B_DIFF,                                                   "Dist:",                1191, 40, 84,19, &G.scene->toolsettings->skgen_retarget_distance_weight, 0, 10, 1, 0,           "Distance Weight");
 -      uiDefButC(block, NUM, B_DIFF,                                                   "Method:",              1025, 20, 125,19, &G.scene->toolsettings->skgen_optimisation_method, 0, 2, 1, 0,"Optimisation Method (0: brute, 1: memoize, 2: annealing max fixed");
  }
  
  static void editing_panel_mesh_skgen(Object *ob, Mesh *me)
@@@ -5852,8 -5853,10 +5852,10 @@@ void sculptmode_draw_interface_textures
                uiBlockBeginAlign(block);
                uiDefBut(block,LABEL,B_NOP,"",cx,cy,115,20,0,0,0,0,0,""); /* Padding */
        } else {
+               ID *id = NULL;
                mtex= sd->mtex[sd->texact];
-               ID *id= NULL;
                uiBlockBeginAlign(block);
                
                if(mtex && mtex->tex) id= &mtex->tex->id;