diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-08 00:18:26 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-08 00:18:26 +0400 |
| commit | 26d8da99cc451c4a60fa0d3f8e467c3dd6ae5e7c (patch) | |
| tree | 622af585d72da3a8077257d3a5ba6f8064fc7f8d /source/blender | |
| parent | f3fc5a8b6103f7f8b256fdceee8412e0182a5a8f (diff) | |
Bug [#17454] Wave modifier crash, fix provided by Banlu Kemiyatorn
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/src/buttons_editing.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index c83d7b2e124..0a792b05428 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -1573,6 +1573,18 @@ static void build_uvlayer_menu_vars(CustomData *data, char **menu_string, } } +void set_wave_uvlayer(void *arg1, void *arg2) +{ + WaveModifierData *wmd=arg1; + CustomDataLayer *layer = arg2; + + /*check we have UV layers*/ + if (wmd->uvlayer_tmp < 1) return; + layer = layer + (wmd->uvlayer_tmp-1); + + strcpy(wmd->uvlayer_name, layer->name); +} + void set_displace_uvlayer(void *arg1, void *arg2) { DisplaceModifierData *dmd=arg1; @@ -2193,7 +2205,7 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco 0.0, 1.0, 0, 0, "Set the UV layer to use"); MEM_freeN(strtmp); i = CustomData_get_layer_index(fdata, CD_MTFACE); - uiButSetFunc(but, set_displace_uvlayer, wmd, + uiButSetFunc(but, set_wave_uvlayer, wmd, &fdata->layers[i]); } if(wmd->texmapping == MOD_DISP_MAP_OBJECT) { |