Shape Keys: disable the temporary shape display system, where
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 14 Oct 2009 13:21:54 +0000 (13:21 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 14 Oct 2009 13:21:54 +0000 (13:21 +0000)
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.

source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/key.c
source/blender/editors/object/object_select.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/intern/rna_object.c

index ec054bc47cd527a9b0f1160ca0ff9fa352852f5d..26ea17a296ad6cbedba9649809a3da8d886a8e37 100644 (file)
@@ -2037,7 +2037,6 @@ static void dag_object_time_update_flags(Object *ob)
                                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 @@ static void dag_object_time_update_flags(Object *ob)
                                if(cu->key) {
                                        if(!(ob->shapeflag & OB_SHAPE_LOCK)) {
                                                ob->recalc |= OB_RECALC_DATA;
-                                               ob->shapeflag &= ~OB_SHAPE_TEMPLOCK;
                                        }
                                }
                                break;
@@ -2063,7 +2061,6 @@ static void dag_object_time_update_flags(Object *ob)
                                if(lt->key) {
                                        if(!(ob->shapeflag & OB_SHAPE_LOCK)) {
                                                ob->recalc |= OB_RECALC_DATA;
-                                               ob->shapeflag &= ~OB_SHAPE_TEMPLOCK;
                                        }
                                }
                                        break;
@@ -2216,7 +2213,7 @@ void DAG_id_flush_update(ID *id, short flag)
                        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;
                }
        }
index 39f9ed808fddb0e70a9bdab604e30d07beef2a86..b6e4ffd6cc3861f7f501c4685893e02ad8c1af8c 100644 (file)
@@ -1368,7 +1368,7 @@ int do_ob_key(Scene *scene, Object *ob)
        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);
index 27713cc2fa938ca901e369ce7b52d8037b56786f..90d1a9df93ed1ef3ed64ae518b427d574575f4cf 100644 (file)
@@ -105,13 +105,6 @@ void ED_base_object_activate(bContext *C, Base *base)
                /* 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
index 73bf698db163e85e533b547d95d9057a4cc4b53e..4cf78c83cd059e7da72f5dfd48014129feb6248b 100644 (file)
@@ -499,7 +499,7 @@ extern Object workob;
 
 /* 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
index 2f40cacbda63349a4eb45239bfc74994d2e6cab4..092f18ef0e254146daeaeb20435f26f2dc0691da 100644 (file)
@@ -747,7 +747,6 @@ static void rna_Object_active_shape_key_index_set(PointerRNA *ptr, int value)
        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 @@ static void rna_Object_shape_key_lock_set(PointerRNA *ptr, int value)
 
        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)