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

Three fixes in 1 commit; (reports 3183 3201 3203)

Browse Source 
- added redraw of Oops/Outliner on selecting in Databrowse
- Ipo Record in ipo window had copy paste error, causing in potential mem
  errors
- Ipo Record now creates a new Ipo again
This commit is contained in:
Ton Roosendaal
2005-10-17 19:03:16 +00:00
parent 5991b078c9
commit 4d2c0d3ef1
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/src/editipo.c
View File

@@ -4059,7 +4059,7 @@ void ipo_record(void)
extern double tottime;
EditIpo *ei, *ei1=0, *ei2=0;
ScrArea *sa, *oldarea;
Ipo *ipo;
// Ipo *ipo;
Object *ob;
void *poin;
double swaptime;
@@ -4076,9 +4076,9 @@ void ipo_record(void)
if(anim < 1) return;
if(anim!=2) anim= 0;
ipo= verify_ipo(G.sipo->from, G.sipo->blocktype, G.sipo->actname, G.sipo->constname);
if(G.sipo) G.sipo->ipo= ipo;
// ipo= verify_ipo(G.sipo->from, G.sipo->blocktype, G.sipo->actname, G.sipo->constname);
// test_editipo();
ob= OBACT;
/* find the curves... */
@@ -4100,7 +4100,7 @@ void ipo_record(void)
error("Select 1 or 2 channels");
return;
}
/* make curves ready, start values */
if(ei1->icu==NULL)
ei1->icu= verify_ipocurve(G.sipo->from, G.sipo->blocktype, G.sipo->actname, G.sipo->constname, ei1->adrcode);
@@ -4113,7 +4113,7 @@ void ipo_record(void)
if(ei2) {
if(ei2->icu==NULL)
ei1->icu= verify_ipocurve(G.sipo->from, G.sipo->blocktype, G.sipo->actname, G.sipo->constname, ei2->adrcode);
ei2->icu= verify_ipocurve(G.sipo->from, G.sipo->blocktype, G.sipo->actname, G.sipo->constname, ei2->adrcode);
if(ei2->icu==NULL) return;
poin= get_ipo_poin(G.sipo->from, ei2->icu, &type);
@@ -4121,7 +4121,6 @@ void ipo_record(void)
or2= ei2->icu->curval;
ei2->icu->flag |= IPO_LOCK;
}
fac= G.v2d->cur.ymax - G.v2d->cur.ymin;
fac/= (float)curarea->winy;

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

@@ -2385,6 +2385,7 @@ static void filesel_select_objects(SpaceFile *sfile)
}
countall();
allqueue(REDRAWVIEW3D, 0);
allqueue(REDRAWOOPS, 0);
}
else if( strcmp(sfile->dir, "Scene/")==0 ) {
@@ -2419,6 +2420,7 @@ static void active_file_object(SpaceFile *sfile)
BASACT->flag |= SELECT;
sfile->filelist[sfile->act].flags |= ACTIVE;
allqueue(REDRAWVIEW3D, 0);
allqueue(REDRAWOOPS, 0);
scrarea_queue_winredraw(curarea);
}
}