[Bf-blender-cvs] [f0f36ee] soc-2014-shapekey: Merge branch 'master' into soc-2014-shapekey

[Bastien Montagne]

Commit: f0f36eeef0264e5a492fe04e50a351571574663a
Author: Bastien Montagne
Date:   Sun Oct 19 20:26:09 2014 +0200
Branches: soc-2014-shapekey
https://developer.blender.org/rBf0f36eeef0264e5a492fe04e50a351571574663a

Merge branch 'master' into soc-2014-shapekey

Conflicts:
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/transform/transform_generics.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 108aedb,bd1b5f2..1377fd2
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -436,27 -435,4 +436,15 @@@ void blo_do_versions_270(FileData *fd, 
  			}
  		}
  	}
 +
- 	// uncomment when commiting
- 		/*
- 		if (!MAIN_VERSION_ATLEAST(main, 273, 0)) {
- 			Scene *scene;
- 
- 			for (scene = main->scene.first; scene; scene = scene->id.next) {
- 				scene->r.svg_mode = FREESTYLE_CONTROL_SVG_FRAME;
- 			}
- 		}
- 	*/
- 
- 
 +/*	if (!MAIN_VERSION_ATLEAST(main, 273, 0)) { */
 +		if (!DNA_struct_elem_find(fd->filesdna, "Key", "short", "mix_mode")) {
 +			Key *k;
 +
 +			/* set mixing to be governed by animdata */
 +			for (k = main->key.first; k; k = k->id.next) {
 +				k->mix_mode = KEY_MIX_FROM_ANIMDATA;
 +			}
 +		}
 +/*	} */
  }