diff options
author | Martin Poirier <theeth@yahoo.com> | 2008-11-21 01:23:01 +0300 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2008-11-21 01:23:01 +0300 |
commit | c6ff0ec49d7781ba3b320299c34789fedae0e7ba (patch) | |
tree | fa710ff9bdd409faa4103d621fd2cad8dafd536a /source | |
parent | 0f3e985aca18a514ad59b54007781a63f22c74eb (diff) |
Change name templating to &S and &N (less potential bugs).
It now also accepts lower case versions (&s and &n).
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/src/drawview.c | 4 | ||||
-rw-r--r-- | source/blender/src/editarmature_retarget.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 2d0cf01d4a8..6a9530e27cb 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -2363,8 +2363,8 @@ static void view3d_panel_bonesketch_spaces(short cntrl) uiDefButF(block, NUM, B_DIFF, "D:", 143,yco, 67,19, &G.scene->toolsettings->skgen_retarget_distance_weight, 0, 10, 1, 0, "Distance Weight"); yco -= 20; - uiDefBut(block, TEX,0,"S:", 10, yco, 90, 20, G.scene->toolsettings->skgen_side_string, 0.0, 8.0, 0, 0, "Text to replace %S with"); - uiDefBut(block, TEX,0,"N:", 100, yco, 90, 20, G.scene->toolsettings->skgen_num_string, 0.0, 8.0, 0, 0, "Text to replace %N with"); + uiDefBut(block, TEX,0,"S:", 10, yco, 90, 20, G.scene->toolsettings->skgen_side_string, 0.0, 8.0, 0, 0, "Text to replace &S with"); + uiDefBut(block, TEX,0,"N:", 100, yco, 90, 20, G.scene->toolsettings->skgen_num_string, 0.0, 8.0, 0, 0, "Text to replace &N with"); uiDefIconButBitC(block, TOG, SK_RETARGET_AUTONAME, B_DIFF, ICON_AUTO,190,yco,20,20, &G.scene->toolsettings->skgen_retarget_options, 0, 0, 0, 0, "Use Auto Naming"); /* auto renaming magic */ diff --git a/source/blender/src/editarmature_retarget.c b/source/blender/src/editarmature_retarget.c index c2a64ef017b..019d91d9bff 100644 --- a/source/blender/src/editarmature_retarget.c +++ b/source/blender/src/editarmature_retarget.c @@ -460,14 +460,14 @@ static void renameTemplateBone(char *name, char *template_name, ListBase *editbo for (i = 0, j = 0; template_name[i] != '\0' && i < 31 && j < 31; i++) { - if (template_name[i] == '%') + if (template_name[i] == '&') { - if (template_name[i+1] == 'S') + if (template_name[i+1] == 'S' || template_name[i+1] == 's') { j += sprintf(name + j, side_string); i++; } - else if (template_name[i+1] == 'N') + else if (template_name[i+1] == 'N' || template_name[i+1] == 'n') { j += sprintf(name + j, num_string); i++; |