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

[Antony Riakiotakis]

Commit: 830e11050492fa414eddf76f6c21c9853960d308
Author: Antony Riakiotakis
Date:   Fri Apr 11 15:26:10 2014 +0300
https://developer.blender.org/rB830e11050492fa414eddf76f6c21c9853960d308

Merge branch 'master' into soc-2013-paint

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 0feaa6b,d310c83..93a1c61
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -152,13 -153,11 +153,19 @@@ void blo_do_versions_270(FileData *fd, 
  				}
  			}
  		}
+ 
+ 		for (sce = main->scene.first; sce; sce = sce->id.next) {
+ 			if (sce->r.raytrace_structure == R_RAYSTRUCTURE_BLIBVH) {
+ 				sce->r.raytrace_structure = R_RAYSTRUCTURE_AUTO;
+ 			}
+ 		}
  	}
 +
 +	if (!MAIN_VERSION_ATLEAST(main, 270, 2)) {
 +		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;
 +		}
 +	}
- }
+ }