[Bf-blender-cvs] [5fea04b] soc-2014-shapekey: Changed the subversion back to master

[Grigory Revzin]

Commit: 5fea04bed0ba6cf672a27128c9db73af85c66dab
Author: Grigory Revzin
Date:   Thu Jun 12 17:27:14 2014 +0400
https://developer.blender.org/rB5fea04bed0ba6cf672a27128c9db73af85c66dab

Changed the subversion back to master

Versioning now uses DNA_struct_elem_find

Also, got rid of forgotten auto-commit leftover

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

M	source/blender/blenkernel/BKE_blender.h
M	source/blender/blenloader/intern/versioning_270.c
M	source/blender/editors/mesh/editmesh_utils.c
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index a3b7760..e4ebe0e 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -42,7 +42,7 @@ extern "C" {
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         270
-#define BLENDER_SUBVERSION      295
+#define BLENDER_SUBVERSION      5
 /* 262 was the last editmesh release but it has compatibility code for bmesh data */
 #define BLENDER_MINVERSION      270
 #define BLENDER_MINSUBVERSION   5
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 394e1d1..12db654 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -252,16 +252,9 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 		}
 	}
 
-	if (!MAIN_VERSION_ATLEAST(main, 270, 295)) {
-		/* XXX insert appropriate version later!*/
-		Scene *sc;
+	if (!DNA_struct_elem_find(fd->filesdna, "Key", "short", "mix_mode")) {
 		Key *k;
 
-		/* Enable auto-committing shape keys! */
-		for (sc = main->scene.first; sc; sc = sc->id.next) {
-			sc->toolsettings->kb_auto_commit = true;
-		}
-
 		/* set mixing to be governed by animdata */
 		for (k = main->key.first; k; k = k->id.next) {
 			k->mix_mode = KEY_MIX_FROM_ANIMDATA;
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index 4dc2f71..a234141 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -717,14 +717,11 @@ void EDBM_handle_active_shape_update(Object *ob, Scene *s)
 	if (kb == key->scratch.origin)
 		return;
 
-	/* handle auto-committing */
-	if (s->toolsettings->kb_auto_commit) {
-		EDBM_commit_scratch_to_active(ob, s);
-		EDBM_update_scratch_from_active(ob);
-		em = BKE_editmesh_from_object(ob);
-		EDBM_update_generic(em, false, false);
-	}  
-	/* if there's no auto-committing, don't do anything */
+
+	EDBM_commit_scratch_to_active(ob, s);
+	EDBM_update_scratch_from_active(ob);
+	em = BKE_editmesh_from_object(ob);
+	EDBM_update_generic(em, false, false);
 }
 
 
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 1ebef6c..b5fee68 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1078,10 +1078,7 @@ typedef struct ToolSettings {
 	/* Grease Pencil */
 	char gpencil_flags;
 
-	char pad[4];
-
-	/* auto-commit editcos to keyblocks */
-	char kb_auto_commit;
+	char pad[5];
 
 	/* Image Paint (8 byttse aligned please!) */
 	struct ImagePaintSettings imapaint;
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index ce84a64..4f67e51 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2094,13 +2094,6 @@ static void rna_def_tool_settings(BlenderRNA  *brna)
 	RNA_def_property_struct_type(prop, "MeshStatVis");
 	RNA_def_property_ui_text(prop, "Mesh Statistics Visualization", NULL);
 
-	/* Auto-commit editcos */
-	prop = RNA_def_property(srna, "kb_auto_commit", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "kb_auto_commit", KB_AUTO_COMMIT);
-	RNA_def_property_ui_text(prop, "Auto-commit edited shape key", 
-									"Automatically commit the shape key when the active shape"
-									"is changed or editmode is toolged");
-
 }
 
 static void rna_def_unified_paint_settings(BlenderRNA  *brna)