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

[Antony Riakiotakis]

Commit: 28e2471654ffad6f7585786931c5c4400aed8461
Author: Antony Riakiotakis
Date:   Tue Apr 29 16:58:03 2014 +0300
https://developer.blender.org/rB28e2471654ffad6f7585786931c5c4400aed8461

Merge branch 'master' into soc-2013-paint

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

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



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

diff --cc source/blender/blenkernel/BKE_blender.h
index 6326ba1,e4ebe0e..86f83bb
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@@ -42,10 -42,10 +42,10 @@@ extern "C" 
   * and keep comment above the defines.
   * Use STRINGIFY() rather than defining with quotes */
  #define BLENDER_VERSION         270
--#define BLENDER_SUBVERSION      5
++#define BLENDER_SUBVERSION      6
  /* 262 was the last editmesh release but it has compatibility code for bmesh data */
- #define BLENDER_MINVERSION      262
- #define BLENDER_MINSUBVERSION   0
+ #define BLENDER_MINVERSION      270
+ #define BLENDER_MINSUBVERSION   5
  
  /* used by packaging tools */
  /* can be left blank, otherwise a,b,c... etc with no quotes */
diff --cc source/blender/blenloader/intern/versioning_270.c
index 24cda75,ae6d5ee..dbf2360
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -205,13 -233,22 +233,30 @@@ void blo_do_versions_270(FileData *fd, 
  	}
  
  	if (!MAIN_VERSION_ATLEAST(main, 270, 5)) {
+ 		Object *ob;
+ 
+ 		/* Update Transform constraint (again :|). */
+ 		for (ob = main->object.first; ob; ob = ob->id.next) {
+ 			do_version_constraints_radians_degrees_270_5(&ob->constraints);
+ 
+ 			if (ob->pose) {
+ 				/* Bones constraints! */
+ 				bPoseChannel *pchan;
+ 				for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+ 					do_version_constraints_radians_degrees_270_5(&pchan->constraints);
+ 				}
+ 			}
+ 		}
+ 	}
+ 
++	if (!MAIN_VERSION_ATLEAST(main, 270, 6)) {
 +		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;
 +		}
 +	}
 +
  	if (!DNA_struct_elem_find(fd->filesdna, "Material", "int", "mode2")) { /* will be replaced with version check when other new flag is added to mode2 */
  		Material *ma;