Revision: 48791
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48791
Author: nazgul
Date: 2012-07-10 09:12:21 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
Tomato: fix typos in mask maps used for raster cache
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
2012-07-10 09:12:17 UTC (rev 48790)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
2012-07-10 09:12:21 UTC (rev 48791)
@@ -1389,7 +1389,7 @@
fd->maskmap = oldnewmap_new();
- for (mask = oldmain->movieclip.first; mask; mask = mask->id.next) {
+ for (mask = oldmain->mask.first; mask; mask = mask->id.next) {
if (mask->raster_cache)
oldnewmap_insert(fd->maskmap, mask->raster_cache,
mask->raster_cache, 0);
}
@@ -1399,12 +1399,12 @@
/* this works because freeing old main only happens after this call */
void blo_end_mask_pointer_map(FileData *fd, Main *oldmain)
{
- OldNew *entry = fd->movieclipmap->entries;
+ OldNew *entry = fd->maskmap->entries;
Mask *mask;
int i;
/* used entries were restored, so we put them to zero */
- for (i = 0; i < fd->movieclipmap->nentries; i++, entry++) {
+ for (i = 0; i < fd->maskmap->nentries; i++, entry++) {
if (entry->nr > 0)
entry->newp = NULL;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
