[Bf-blender-cvs] [4eb113d] temp_merge_gooseberry_hair: Fix for incorrect DNA field name in versioning, causes constant resetting of clump noise size on reload.

[Lukas Tönne]

Commit: 4eb113d2c32153588ae2520b49aaba4c2ed120ba
Author: Lukas Tönne
Date:   Mon Jan 19 15:09:44 2015 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB4eb113d2c32153588ae2520b49aaba4c2ed120ba

Fix for incorrect DNA field name in versioning, causes constant
resetting of clump noise size on reload.

Conflicts:
	source/blender/blenloader/intern/versioning_270.c

===================================================================

M	source/blender/blenloader/intern/versioning_270.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 7196f16..b77a6fd 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -457,7 +457,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!DNA_struct_elem_find(fd->filesdna, "ParticleSettings", "float", "clumpnoisesize")) {
+	if (!DNA_struct_elem_find(fd->filesdna, "ParticleSettings", "float", "clump_noise_size")) {
 		ParticleSettings *part;
 		for (part = main->particle.first; part; part = part->id.next) {
 			part->clump_noise_size = 1.0f;