[Bf-blender-cvs] [c95c25e] hair_immediate_fixes: Merge branch 'master' into hair_immediate_fixes

[Lukas Tönne]

Commit: c95c25e29efdb557038580d8203160fb372b6999
Author: Lukas Tönne
Date:   Wed Sep 24 10:05:04 2014 +0200
Branches: hair_immediate_fixes
https://developer.blender.org/rBc95c25e29efdb557038580d8203160fb372b6999

Merge branch 'master' into hair_immediate_fixes

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

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index fcca159,67d51ab..991da62
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -375,22 -368,12 +368,31 @@@ void blo_do_versions_270(FileData *fd, 
  		}
  	}
  
+ 	if (!MAIN_VERSION_ATLEAST(main, 272, 0)) {
+ 		if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "int", "preview_start_resolution")) {
+ 			Scene *scene;
+ 			for (scene = main->scene.first; scene; scene = scene->id.next) {
+ 				scene->r.preview_start_resolution = 64;
+ 			}
+ 		}
+ 	}
++
 +	if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings", "int", "voxel_res")) {
 +		Object *ob;
 +		ModifierData *md;
 +		for (ob = main->object.first; ob; ob = ob->id.next) {
 +			for (md = ob->modifiers.first; md; md = md->next) {
 +				if (md->type == eModifierType_Cloth) {
 +					ClothModifierData *clmd = (ClothModifierData*) md;
 +					clmd->sim_parms->voxel_res = 32;
 +				}
 +				else if (md->type == eModifierType_ParticleSystem) {
 +					ParticleSystemModifierData *pmd = (ParticleSystemModifierData*) md;
 +					if (pmd->psys->clmd) {
 +						pmd->psys->clmd->sim_parms->voxel_res = 32;
 +					}
 +				}
 +			}
 +		}
 +	}
  }