[Bf-blender-cvs] [d9af8e9] GPencil_Editing_Stage3: Merge branch 'master' into GPencil_Editing_Stage3

[Joshua Leung]

Commit: d9af8e9b4166270e003e25c8cef4b68137a3b78b
Author: Joshua Leung
Date:   Tue Sep 29 02:21:02 2015 +1300
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rBd9af8e9b4166270e003e25c8cef4b68137a3b78b

Merge branch 'master' into GPencil_Editing_Stage3

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

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index c70e53e,1f4aa3c..e4a7490
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -854,51 -854,18 +854,66 @@@ void blo_do_versions_270(FileData *fd, 
  #undef BRUSH_TORUS
  	}
  
+ 	if (!MAIN_VERSION_ATLEAST(main, 276, 2)) {
+ 		if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "float", "custom_scale")) {
+ 			Object *ob;
+ 
+ 			for (ob = main->object.first; ob; ob = ob->id.next) {
+ 				if (ob->pose) {
+ 					bPoseChannel *pchan;
+ 					for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+ 						pchan->custom_scale = 1.0f;
+ 					}
+ 				}
+ 			}
+ 		}
+ 	}
++
 +
 +	{
 +		Scene *scene;
 +		for (scene = main->scene.first; scene; scene = scene->id.next) {
 +			ToolSettings *ts = scene->toolsettings;
 +			
 +			if (ts->gp_sculpt.brush[0].size == 0) {
 +				GP_BrushEdit_Settings *gset = &ts->gp_sculpt;
 +				GP_EditBrush_Data *brush;
 +				
 +				brush = &gset->brush[GP_EDITBRUSH_TYPE_SMOOTH];
 +				brush->size = 25;
 +				brush->strength = 0.3f;
 +				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_SMOOTH_PRESSURE;
 +				
 +				brush = &gset->brush[GP_EDITBRUSH_TYPE_THICKNESS];
 +				brush->size = 25;
 +				brush->strength = 0.5f;
 +				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
 +				
 +				brush = &gset->brush[GP_EDITBRUSH_TYPE_GRAB];
 +				brush->size = 50;
 +				brush->strength = 0.3f;
 +				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
 +				
 +				brush = &gset->brush[GP_EDITBRUSH_TYPE_PUSH];
 +				brush->size = 25;
 +				brush->strength = 0.3f;
 +				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
 +				
 +				brush = &gset->brush[GP_EDITBRUSH_TYPE_TWIST];
 +				brush->size = 50;
 +				brush->strength = 0.3f; // XXX?
 +				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
 +				
 +				brush = &gset->brush[GP_EDITBRUSH_TYPE_PINCH];
 +				brush->size = 50;
 +				brush->strength = 0.5f; // XXX?
 +				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
 +				
 +				brush = &gset->brush[GP_EDITBRUSH_TYPE_RANDOMISE];
 +				brush->size = 25;
 +				brush->strength = 0.5f;
 +				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
 +			}
 +		}
 +	}
  }