Bug fix 1148

In do_versions() the new texture parameters were always initialized,
whilst we didn't go for a new release number yet.
Now it checks for a value==0.0

1 files changed, 14 insertions, 14 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6708db87d2b..cc8163e5b73 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4123,20 +4123,20 @@ static void do_versions(Main *main)
 		
 		while(tex) {	
 			/* copied from kernel texture.c */
-			
-			/* musgrave */
-			tex->mg_H = 1.0;
-			tex->mg_lacunarity = 2.0;
-			tex->mg_octaves = 2.0;
-			tex->mg_offset = 1.0;
-			tex->mg_gain = 1.0;
-			tex->ns_outscale = 1.0;
-			/* distnoise */
-			tex->dist_amount = 1.0;
-			/* voronoi */
-			tex->vn_w1 = 1.0;
-			tex->vn_mexp = 2.5;
-			
+			if(tex->ns_outscale==0.0) {
+				/* musgrave */
+				tex->mg_H = 1.0;
+				tex->mg_lacunarity = 2.0;
+				tex->mg_octaves = 2.0;
+				tex->mg_offset = 1.0;
+				tex->mg_gain = 1.0;
+				tex->ns_outscale = 1.0;
+				/* distnoise */
+				tex->dist_amount = 1.0;
+				/* voronoi */
+				tex->vn_w1 = 1.0;
+				tex->vn_mexp = 2.5;
+			}
 			tex= tex->id.next;
 		}