[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46064] branches/soc-2011-tomato/source/ blender: - Synchronize with changes in trunk

[Sergey Sharybin]

Revision: 46064
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46064
Author:   nazgul
Date:     2012-04-29 11:16:40 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
- Synchronize with changes in trunk
- Reverted parts of recent trunk merge related on changes for preview
  image save skip needed for startup.blend generation

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c

Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c	2012-04-29 10:44:00 UTC (rev 46063)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c	2012-04-29 11:16:40 UTC (rev 46064)
@@ -1867,7 +1867,7 @@
 		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;
@@ -1877,7 +1877,7 @@
 		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;

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c	2012-04-29 10:44:00 UTC (rev 46063)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c	2012-04-29 11:16:40 UTC (rev 46064)
@@ -315,7 +315,7 @@
 
 	/* 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;

Modified: branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c	2012-04-29 10:44:00 UTC (rev 46063)
+++ branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c	2012-04-29 11:16:40 UTC (rev 46064)
@@ -787,7 +787,7 @@
 
 	/* 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);
 	}