[Bf-blender-cvs] [6e1c026] soc-2013-paint: Merge branch 'master' into soc-2013-paint

[Antony Riakiotakis]

Commit: 6e1c026f57c00441830a70ef9d3b8fc6f7fdbbae
Author: Antony Riakiotakis
Date:   Fri Apr 18 19:33:40 2014 +0300
https://developer.blender.org/rB6e1c026f57c00441830a70ef9d3b8fc6f7fdbbae

Merge branch 'master' into soc-2013-paint

Conflicts:
	source/blender/blenloader/intern/versioning_270.c

===================================================================



===================================================================

diff --cc source/blender/blenloader/intern/versioning_270.c
index 64d435f,ab2a727..f13afce
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -173,10 -171,12 +171,20 @@@ void blo_do_versions_270(FileData *fd, 
  	}
  
  	if (!MAIN_VERSION_ATLEAST(main, 270, 3)) {
+ 		FreestyleLineStyle *linestyle;
+ 
+ 		for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
+ 			linestyle->flag |= LS_NO_SORTING;
+ 			linestyle->sort_key = LS_SORT_KEY_DISTANCE_FROM_CAMERA;
+ 			linestyle->integration_type = LS_INTEGRATION_MEAN;
+ 		}
+ 	}
++
++	if (!MAIN_VERSION_ATLEAST(main, 270, 4)) {
 +		Scene *sce;
 +		for (sce = main->scene.first; sce; sce = sce->id.next) {
 +			sce->toolsettings->imapaint.new_slot_xresolution = 1024;
 +			sce->toolsettings->imapaint.new_slot_yresolution = 1024;
 +		}
 +	}
  }