[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16415] trunk/blender/source/blender/src/ buttons_editing.c: Bug [#17454] Wave modifier crash, fix provided by Banlu Kemiyatorn

[Daniel Genrich]

Revision: 16415
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16415
Author:   genscher
Date:     2008-09-07 22:18:26 +0200 (Sun, 07 Sep 2008)

Log Message:
-----------
Bug [#17454] Wave modifier crash, fix provided by Banlu Kemiyatorn

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_editing.c

Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c	2008-09-07 19:58:37 UTC (rev 16414)
+++ trunk/blender/source/blender/src/buttons_editing.c	2008-09-07 20:18:26 UTC (rev 16415)
@@ -1573,6 +1573,18 @@
 	}
 }
 
+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 @@
 				      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) {