- Synchronize with changes in trunk
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 29 Apr 2012 11:16:40 +0000 (11:16 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 29 Apr 2012 11:16:40 +0000 (11:16 +0000)
- Reverted parts of recent trunk merge related on changes for preview
  image save skip needed for startup.blend generation

source/blender/blenloader/intern/writefile.c
source/blender/editors/space_clip/space_clip.c
source/blender/windowmanager/intern/wm_files.c

index 5f8e4841d2d824a37ceffc0c77a8ea015d4a7277..42736b6b787828f84558215121e04b504d86fa67 100644 (file)
@@ -1867,7 +1867,7 @@ static void write_previews(WriteData *wd, PreviewImage *prv)
                short h = prv->h[1];
                unsigned int *rect = prv->rect[1];
                /* don't write out large previews if not requested */
                short h = prv->h[1];
                unsigned int *rect = prv->rect[1];
                /* don't write out large previews if not requested */
-               if (!(U.flag & USER_SAVE_PREVIEWS) || TRUE) {
+               if (!(U.flag & USER_SAVE_PREVIEWS)) {
                        prv->w[1] = 0;
                        prv->h[1] = 0;
                        prv->rect[1] = NULL;
                        prv->w[1] = 0;
                        prv->h[1] = 0;
                        prv->rect[1] = NULL;
@@ -1877,7 +1877,7 @@ static void write_previews(WriteData *wd, PreviewImage *prv)
                if (prv->rect[1]) writedata(wd, DATA, prv->w[1]*prv->h[1]*sizeof(unsigned int), prv->rect[1]);
 
                /* restore preview, we still want to keep it in memory even if not saved to file */
                if (prv->rect[1]) writedata(wd, DATA, prv->w[1]*prv->h[1]*sizeof(unsigned int), prv->rect[1]);
 
                /* restore preview, we still want to keep it in memory even if not saved to file */
-               if (!(U.flag & USER_SAVE_PREVIEWS) || TRUE) {
+               if (!(U.flag & USER_SAVE_PREVIEWS) ) {
                        prv->w[1] = w;
                        prv->h[1] = h;
                        prv->rect[1] = rect;
                        prv->w[1] = w;
                        prv->h[1] = h;
                        prv->rect[1] = rect;
index 8339bc14cdde0f1b10fae9a0966ace316b217ab1..9a5a7120a3df6a89b1db457bac50d96f8dd68102 100644 (file)
@@ -315,7 +315,7 @@ static SpaceLink *clip_duplicate(SpaceLink *sl)
 
        /* clear or remove stuff from old */
        scn->scopes.track_preview = NULL;
 
        /* clear or remove stuff from old */
        scn->scopes.track_preview = NULL;
-       scn->scopes.ok = 0;
+       scn->scopes.ok = FALSE;
        scn->draw_context = NULL;
 
        return (SpaceLink *)scn;
        scn->draw_context = NULL;
 
        return (SpaceLink *)scn;
index 7f5271e5ffa641845c7070da046a7c5fe6cb04d8..e50fbaa624ed26e6d143c0c0fffe0f2cbc45c263 100644 (file)
@@ -787,7 +787,7 @@ int WM_write_file(bContext *C, const char *target, int fileflags, ReportList *re
 
        /* blend file thumbnail */
        /* save before exit_editmode, otherwise derivedmeshes for shared data corrupt #27765) */
 
        /* blend file thumbnail */
        /* save before exit_editmode, otherwise derivedmeshes for shared data corrupt #27765) */
-       if ((U.flag & USER_SAVE_PREVIEWS) && 0) {
+       if (U.flag & USER_SAVE_PREVIEWS) {
                ibuf_thumb = blend_file_thumb(CTX_data_scene(C), CTX_wm_screen(C), &thumb);
        }
 
                ibuf_thumb = blend_file_thumb(CTX_data_scene(C), CTX_wm_screen(C), &thumb);
        }