sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

== NLA Editor ==

Browse Source 
When adding a new Action Strip to an Object which didn't have any Action Strips previously, NLA-override mode is turned on by default for that object (the Action/NLA-icon beside the expand/collapse triangle).
This commit is contained in:
Joshua Leung 2007-06-01 10:38:17 +00:00
parent 16f4953230
commit 84ec2711ac
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/nla.c
View File

@ -141,7 +141,10 @@ bActionStrip *convert_action_to_strip (Object *ob)
//set_active_strip(ob, nstrip); /* is in editnla as does UI calls */
nstrip->repeat = 1.0;
if(ob->nlastrips.first == NULL)
ob->nlaflag |= OB_NLA_OVERRIDE;
BLI_addtail(&ob->nlastrips, nstrip);
return nstrip; /* is created, malloced etc. here so is safe to just return the pointer?
this is needed for setting this active in UI, and probably useful for API too */

6
source/blender/src/editnla.c
View File

@ -526,6 +526,9 @@ static void add_nla_block(short event)
if(strip->object)
id_lib_extern(&strip->object->id); /* checks lib data, sets correct flag for saving then */
if(ob->nlastrips.first == NULL)
ob->nlaflag |= OB_NLA_OVERRIDE;
BLI_addtail(&ob->nlastrips, strip);
BIF_undo_push("Add NLA strip");
@ -580,6 +583,9 @@ static void add_nla_block_by_name(char name[32], Object *ob, short hold, short a
act->id.us++;
if(ob->nlastrips.first == NULL)
ob->nlaflag |= OB_NLA_OVERRIDE;
BLI_addtail(&ob->nlastrips, strip);
}