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

[Lukas Tönne]

Commit: c8912073e62d503f9caa645963a282228c3af4f2
Author: Lukas Tönne
Date:   Mon Jan 19 15:09:44 2015 +0100
Branches: master
https://developer.blender.org/rBc8912073e62d503f9caa645963a282228c3af4f2

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 29068d2..c652f56 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -492,7 +492,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;