Three fixes in 1 commit; (reports 3183 3201 3203)
authorTon Roosendaal <ton@blender.org>
Mon, 17 Oct 2005 19:03:16 +0000 (19:03 +0000)
committerTon Roosendaal <ton@blender.org>
Mon, 17 Oct 2005 19:03:16 +0000 (19:03 +0000)
- 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

source/blender/src/editipo.c
source/blender/src/filesel.c

index fadf35529e6e13a590456be1ce604db0cd03cc30..c29b98b376877d87b08d84802bb5ee5c731fa36d 100644 (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;
 
index 0a761728fa2e31d364a1d2c1d88b0766cc05c197..35bede646cf21c62aaf0b2b875f013f86b8f5ffb 100644 (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);
                                }
                        }