archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Shape Keys: disable the temporary shape display system, where

Browse Source 
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.
This commit is contained in:
Brecht Van Lommel
2009-10-14 13:21:54 +00:00
parent c7c2e3de1e
commit 1ce959b16e
5 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/depsgraph.c
View 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;
}
}

2
source/blender/blenkernel/intern/key.c
View 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);

7
source/blender/editors/object/object_select.c
View 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

2
source/blender/makesdna/DNA_object_types.h
View 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

3
source/blender/makesrna/intern/rna_object.c
View 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)