[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23832] trunk/blender/source/blender: Shape Keys: disable the temporary shape display system, where

[Brecht Van Lommel]

Revision: 23832
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23832
Author:   blendix
Date:     2009-10-14 15:21:54 +0200 (Wed, 14 Oct 2009)

Log Message:
-----------
Shape Keys: disable the temporary shape display system, where
it would show you the last selected shape key until doing
another operation. This is confusing, and the Pin button allows
you to do the same kind of shape browsing.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/depsgraph.c
    trunk/blender/source/blender/blenkernel/intern/key.c
    trunk/blender/source/blender/editors/object/object_select.c
    trunk/blender/source/blender/makesdna/DNA_object_types.h
    trunk/blender/source/blender/makesrna/intern/rna_object.c

Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2009-10-14 13:20:20 UTC (rev 23831)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2009-10-14 13:21:54 UTC (rev 23832)
@@ -2037,7 +2037,6 @@
 				if(me->key) {
 					if(!(ob->shapeflag & OB_SHAPE_LOCK)) {
 						ob->recalc |= OB_RECALC_DATA;
-						ob->shapeflag &= ~OB_SHAPE_TEMPLOCK;
 					}
 				}
 				if(ob->particlesystem.first)
@@ -2049,7 +2048,6 @@
 				if(cu->key) {
 					if(!(ob->shapeflag & OB_SHAPE_LOCK)) {
 						ob->recalc |= OB_RECALC_DATA;
-						ob->shapeflag &= ~OB_SHAPE_TEMPLOCK;
 					}
 				}
 				break;
@@ -2063,7 +2061,6 @@
 				if(lt->key) {
 					if(!(ob->shapeflag & OB_SHAPE_LOCK)) {
 						ob->recalc |= OB_RECALC_DATA;
-						ob->shapeflag &= ~OB_SHAPE_TEMPLOCK;
 					}
 				}
 					break;
@@ -2216,7 +2213,7 @@
 			else if(ob->type==OB_CURVE || ob->type==OB_SURF)
 				id= NULL;
 			/* also for locked shape keys we make an exception */
-			else if(ob_get_key(ob) && (ob->shapeflag & (OB_SHAPE_LOCK|OB_SHAPE_TEMPLOCK)))
+			else if(ob_get_key(ob) && (ob->shapeflag & OB_SHAPE_LOCK))
 				id= NULL;
 		}
 	}

Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c	2009-10-14 13:20:20 UTC (rev 23831)
+++ trunk/blender/source/blender/blenkernel/intern/key.c	2009-10-14 13:21:54 UTC (rev 23832)
@@ -1368,7 +1368,7 @@
 	if(key==NULL)
 		return 0;
 		
-	if(ob->shapeflag & (OB_SHAPE_LOCK|OB_SHAPE_TEMPLOCK)) {
+	if(ob->shapeflag & OB_SHAPE_LOCK) {
 		KeyBlock *kb= BLI_findlink(&key->block, ob->shapenr-1);
 		
 		if (G.f & G_DEBUG) printf("ob %s, key %s locked \n", ob->id.name+2, key->id.name+2);

Modified: trunk/blender/source/blender/editors/object/object_select.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_select.c	2009-10-14 13:20:20 UTC (rev 23831)
+++ trunk/blender/source/blender/editors/object/object_select.c	2009-10-14 13:21:54 UTC (rev 23832)
@@ -105,13 +105,6 @@
 		/* XXX old signals, remember to handle notifiers now! */
 		//		select_actionchannel_by_name(base->object->action, "Object", 1);
 		
-		/* disable temporal locks */
-		for(tbase=FIRSTBASE; tbase; tbase= tbase->next) {
-			if(base!=tbase && (tbase->object->shapeflag & OB_SHAPE_TEMPLOCK)) {
-				tbase->object->shapeflag &= ~OB_SHAPE_TEMPLOCK;
-				DAG_id_flush_update(&tbase->object->id, OB_RECALC_DATA);
-			}
-		}
 		WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, scene);
 	}
 	else

Modified: trunk/blender/source/blender/makesdna/DNA_object_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_object_types.h	2009-10-14 13:20:20 UTC (rev 23831)
+++ trunk/blender/source/blender/makesdna/DNA_object_types.h	2009-10-14 13:21:54 UTC (rev 23832)
@@ -499,7 +499,7 @@
 
 /* ob->shapeflag */
 #define OB_SHAPE_LOCK		1
-#define OB_SHAPE_TEMPLOCK	2
+#define OB_SHAPE_TEMPLOCK	2		// deprecated
 
 /* ob->nlaflag */
 	// XXX depreceated - old animation system

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2009-10-14 13:20:20 UTC (rev 23831)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2009-10-14 13:21:54 UTC (rev 23832)
@@ -747,7 +747,6 @@
 	Object *ob= (Object*)ptr->id.data;
 
 	ob->shapenr= value+1;
-	ob->shapeflag |= OB_SHAPE_TEMPLOCK;
 }
 
 static PointerRNA rna_Object_active_shape_key_get(PointerRNA *ptr)
@@ -771,8 +770,6 @@
 
 	if(value) ob->shapeflag |= OB_SHAPE_LOCK;
 	else ob->shapeflag &= ~OB_SHAPE_LOCK;
-
-	ob->shapeflag &= ~OB_SHAPE_TEMPLOCK;
 }
 
 static PointerRNA rna_Object_field_get(PointerRNA *ptr)