griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Orange bugfix; using in NLA window the Ckey option (Convert to NLA), did

Browse Source 
not use the proper call to increase user count && set the action to get
a tag "extern linked". This caused actions to get lost when indirectly
linked from library files.
This commit is contained in:
Ton Roosendaal
2005-12-16 12:49:42 +00:00
parent f28963514b
commit 3dd6f554f6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -351,7 +351,7 @@ static void convert_nla(short mval[2])
/* Link the action to the nstrip */
nstrip->act = base->object->action;
nstrip->act->id.us++;
id_us_plus(&nstrip->act->id);
calc_action_range(nstrip->act, &nstrip->actstart, &nstrip->actend);
nstrip->start = nstrip->actstart;
nstrip->end = nstrip->actend;

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

@@ -981,7 +981,8 @@ int blenderqread(unsigned short event, short val)
screen_swapbuffers();
}
else if(event==3) {
BKE_write_undo("10 timer");
BIF_undo();
BIF_redo();
}
}
@@ -989,8 +990,7 @@ int blenderqread(unsigned short event, short val)
if(event==1) sprintf(tmpstr, "draw %%t|%d ms", time);
if(event==2) sprintf(tmpstr, "d+sw %%t|%d ms", time);
if(event==3) sprintf(tmpstr, "displist %%t|%d ms", time);
if(event==4) sprintf(tmpstr, "undo %%t|%d ms", time);
if(event==3) sprintf(tmpstr, "undo %%t|%d ms", time);
waitcursor(0);
pupmenu(tmpstr);