Merging r43909 through r43951 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 7 Feb 2012 15:04:56 +0000 (15:04 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 7 Feb 2012 15:04:56 +0000 (15:04 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_clip/space_clip.c

index b30d04b31cc7d486516bc82ba200ccc09adbe25b,5f737ea4e5315af71dae03f26938a7a318bdf257..cff4f3965fa34bf8760a7fdcab16e971f3e67f8e
@@@ -4769,8 -4769,8 +4769,8 @@@ static void lib_link_scene(FileData *fd
                        (void)marker;
  #endif
  
-                       if(sce->ed)
-                               seq_update_muting(sce->ed);
+                       seq_update_muting(sce->ed);
+                       seq_update_sound_bounds_all(sce);
                        
                        if(sce->nodetree) {
                                lib_link_ntree(fd, &sce->id, sce->nodetree);
@@@ -5273,7 -5273,6 +5273,7 @@@ static void lib_link_screen(FileData *f
                                                sclip->clip= newlibadr_us(fd, sc->id.lib, sclip->clip);
  
                                                sclip->scopes.track_preview = NULL;
 +                                              sclip->draw_context = NULL;
                                                sclip->scopes.ok = 0;
                                        }
                                }
index 7cd7060e1d457ade3e260a51bb1afac4e369fc2d,97da05e3f764941ba0c9c6cd386672885467c502..41c52e6fa0b2129c2f6650720061e6f8289a2b70
@@@ -214,8 -214,6 +214,8 @@@ static void clip_free(SpaceLink *sl
  
        if(sc->scopes.track_preview)
                IMB_freeImBuf(sc->scopes.track_preview);
 +
 +      ED_space_clip_free_texture_buffer(sc);
  }
  
  /* spacetype; init callback */
@@@ -231,7 -229,6 +231,7 @@@ static SpaceLink *clip_duplicate(SpaceL
        /* clear or remove stuff from old */
        scn->scopes.track_preview= NULL;
        scn->scopes.ok= 0;
 +      scn->draw_context= NULL;
  
        return (SpaceLink *)scn;
  }
@@@ -596,6 -593,7 +596,7 @@@ static void clip_refresh(const bContex
  {
        wmWindowManager *wm= CTX_wm_manager(C);
        wmWindow *window= CTX_wm_window(C);
+       Scene *scene = CTX_data_scene(C);
        SpaceClip *sc= (SpaceClip *)sa->spacedata.first;
        ARegion *ar_main= BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
        ARegion *ar_preview= clip_has_preview_region(C, sa);
                ED_area_tag_redraw(sa);
        }
  
-       BKE_movieclip_user_set_frame(&sc->user, CTX_data_scene(C)->r.cfra);
+       BKE_movieclip_user_set_frame(&sc->user, scene->r.cfra);
  }
  
  /********************* main region ********************/