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

[Antony Riakiotakis]

Commit: adfcaa28f55a6dd7f5122886f514846899a480e4
Author: Antony Riakiotakis
Date:   Fri Jun 13 17:30:48 2014 +0300
https://developer.blender.org/rBadfcaa28f55a6dd7f5122886f514846899a480e4

Merge branch 'master' into soc-2013-paint

Conflicts:
	source/blender/blenkernel/BKE_blender.h
	source/blender/blenloader/intern/versioning_270.c

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



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

diff --cc source/blender/blenkernel/BKE_blender.h
index 86f83bb,0a692af..8b21532
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@@ -41,8 -41,8 +41,9 @@@ extern "C" 
  /* these lines are grep'd, watch out for our not-so-awesome regex
   * and keep comment above the defines.
   * Use STRINGIFY() rather than defining with quotes */
- #define BLENDER_VERSION         270
- #define BLENDER_SUBVERSION      6
+ #define BLENDER_VERSION         271
 -#define BLENDER_SUBVERSION      0
++#define BLENDER_SUBVERSION      1
++
  /* 262 was the last editmesh release but it has compatibility code for bmesh data */
  #define BLENDER_MINVERSION      270
  #define BLENDER_MINSUBVERSION   5
diff --cc source/blender/blenloader/intern/versioning_270.c
index 2ae3c86,b812cf1..cfd9b87
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -251,57 -251,51 +251,59 @@@ void blo_do_versions_270(FileData *fd, 
  		}
  	}
  
- 	if (!MAIN_VERSION_ATLEAST(main, 270, 6)) {
- 		Scene *sce;
- 		for (sce = main->scene.first; sce; sce = sce->id.next) {
- 			sce->toolsettings->imapaint.slot_xresolution_default = 1024;
- 			sce->toolsettings->imapaint.slot_yresolution_default = 1024;
- 		}
- 	}
+ 	if (!MAIN_VERSION_ATLEAST(main, 271, 0)) {
+ 		if (!DNA_struct_elem_find(fd->filesdna, "Material", "int", "mode2")) {
+ 			Material *ma;
  
- 	if (!DNA_struct_elem_find(fd->filesdna, "Material", "int", "mode2")) {
- 		Material *ma;
+ 			for (ma = main->mat.first; ma; ma = ma->id.next)
+ 				ma->mode2 = MA_CASTSHADOW;
+ 		}
  
- 		for (ma = main->mat.first; ma; ma = ma->id.next)
- 			ma->mode2 = MA_CASTSHADOW;
- 	}
+ 		if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "BakeData", "bake")) {
+ 			Scene *sce;
+ 
+ 			for (sce = main->scene.first; sce; sce = sce->id.next) {
+ 				sce->r.bake.flag = R_BAKE_CLEAR;
+ 				sce->r.bake.width = 512;
+ 				sce->r.bake.height = 512;
+ 				sce->r.bake.margin = 16;
+ 				sce->r.bake.normal_space = R_BAKE_SPACE_TANGENT;
+ 				sce->r.bake.normal_swizzle[0] = R_BAKE_POSX;
+ 				sce->r.bake.normal_swizzle[1] = R_BAKE_POSY;
+ 				sce->r.bake.normal_swizzle[2] = R_BAKE_POSZ;
+ 				BLI_strncpy(sce->r.bake.filepath, U.renderdir, sizeof(sce->r.bake.filepath));
+ 
+ 				sce->r.bake.im_format.planes = R_IMF_PLANES_RGBA;
+ 				sce->r.bake.im_format.imtype = R_IMF_IMTYPE_PNG;
+ 				sce->r.bake.im_format.depth = R_IMF_CHAN_DEPTH_8;
+ 				sce->r.bake.im_format.quality = 90;
+ 				sce->r.bake.im_format.compress = 15;
+ 			}
+ 		}
  
- 	if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "BakeData", "bake")) {
- 		Scene *sce;
+ 		if (!DNA_struct_elem_find(fd->filesdna, "FreestyleLineStyle", "float", "texstep")) {
+ 			FreestyleLineStyle *linestyle;
  
- 		for (sce = main->scene.first; sce; sce = sce->id.next) {
- 			sce->r.bake.flag = R_BAKE_CLEAR;
- 			sce->r.bake.width = 512;
- 			sce->r.bake.height = 512;
- 			sce->r.bake.margin = 16;
- 			sce->r.bake.normal_space = R_BAKE_SPACE_TANGENT;
- 			sce->r.bake.normal_swizzle[0] = R_BAKE_POSX;
- 			sce->r.bake.normal_swizzle[1] = R_BAKE_POSY;
- 			sce->r.bake.normal_swizzle[2] = R_BAKE_POSZ;
- 			BLI_strncpy(sce->r.bake.filepath, U.renderdir, sizeof(sce->r.bake.filepath));
- 
- 			sce->r.bake.im_format.planes = R_IMF_PLANES_RGBA;
- 			sce->r.bake.im_format.imtype = R_IMF_IMTYPE_PNG;
- 			sce->r.bake.im_format.depth = R_IMF_CHAN_DEPTH_8;
- 			sce->r.bake.im_format.quality = 90;
- 			sce->r.bake.im_format.compress = 15;
+ 			for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
+ 				linestyle->flag |= LS_TEXTURE;
+ 				linestyle->texstep = 1.0;
+ 			}
  		}
- 	}
- 
- 	if (!DNA_struct_elem_find(fd->filesdna, "FreestyleLineStyle", "float", "texstep")) {
- 		FreestyleLineStyle *linestyle;
  
- 		for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
- 			linestyle->flag |= LS_TEXTURE;
- 			linestyle->texstep = 1.0;
+ 		{
+ 			Scene *scene;
+ 			for (scene = main->scene.first; scene; scene = scene->id.next) {
+ 				int num_layers = BLI_countlist(&scene->r.layers);
+ 				scene->r.actlay = min_ff(scene->r.actlay, num_layers - 1);
+ 			}
  		}
  	}
 +
- 	{
- 		Scene *scene;
- 		for (scene = main->scene.first; scene; scene = scene->id.next) {
- 			int num_layers = BLI_countlist(&scene->r.layers);
- 			scene->r.actlay = min_ff(scene->r.actlay, num_layers - 1);
++	if (!MAIN_VERSION_ATLEAST(main, 271, 1)) {
++		Scene *sce;
++		for (sce = main->scene.first; sce; sce = sce->id.next) {
++			sce->toolsettings->imapaint.slot_xresolution_default = 1024;
++			sce->toolsettings->imapaint.slot_yresolution_default = 1024;
 +		}
 +	}
  }