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

[Joshua Leung]

Commit: 019a4ffcbe2f9a7a7d68da48d3b45b492f306ac3
Author: Joshua Leung
Date:   Sat Nov 21 00:01:46 2015 +1300
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rB019a4ffcbe2f9a7a7d68da48d3b45b492f306ac3

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 1b3106a,b5199e1..473cbf6
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -867,57 -868,72 +868,121 @@@ void blo_do_versions_270(FileData *fd, 
  				}
  			}
  		}
+ 
+ 		{
+ 			bScreen *screen;
+ #define RV3D_VIEW_PERSPORTHO	 7
+ 			for (screen = main->screen.first; screen; screen = screen->id.next) {
+ 				ScrArea *sa;
+ 				for (sa = screen->areabase.first; sa; sa = sa->next) {
+ 					SpaceLink *sl;
+ 					for (sl = sa->spacedata.first; sl; sl = sl->next) {
+ 						if (sl->spacetype == SPACE_VIEW3D) {
+ 							ARegion *ar;
+ 							ListBase *lb = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
+ 							for (ar = lb->first; ar; ar = ar->next) {
+ 								if (ar->regiontype == RGN_TYPE_WINDOW) {
+ 									if (ar->regiondata) {
+ 										RegionView3D *rv3d = ar->regiondata;
+ 										if (rv3d->view == RV3D_VIEW_PERSPORTHO) {
+ 											rv3d->view = RV3D_VIEW_USER;
+ 										}
+ 									}
+ 								}
+ 							}
+ 							break;
+ 						}
+ 					}
+ 				}
+ 			}
+ #undef RV3D_VIEW_PERSPORTHO
+ 		}
+ 
+ 		{
+ 			Lamp *lamp;
+ #define LA_YF_PHOTON	5
+ 			for (lamp = main->lamp.first; lamp; lamp = lamp->id.next) {
+ 				if (lamp->type == LA_YF_PHOTON) {
+ 					lamp->type = LA_LOCAL;
+ 				}
+ 			}
+ #undef LA_YF_PHOTON
+ 		}
+ 
+ 		{
+ 			Object *ob;
+ 			for (ob = main->object.first; ob; ob = ob->id.next) {
+ 				if (ob->body_type == OB_BODY_TYPE_CHARACTER && (ob->gameflag & OB_BOUNDS) && ob->collision_boundtype == OB_BOUND_TRIANGLE_MESH) {
+ 					ob->boundtype = ob->collision_boundtype = OB_BOUND_BOX;
+ 				}
+ 			}
+ 		}
+ 
  	}
  
+ 	{
+ 		if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "CurveMapping", "mblur_shutter_curve")) {
+ 			Scene *scene;
+ 			for (scene = main->scene.first; scene != NULL; scene = scene->id.next) {
+ 				CurveMapping *curve_mapping = &scene->r.mblur_shutter_curve;
+ 				curvemapping_set_defaults(curve_mapping, 1, 0.0f, 0.0f, 1.0f, 1.0f);
+ 				curvemapping_initialize(curve_mapping);
+ 				curvemap_reset(curve_mapping->cm,
+ 				               &curve_mapping->clipr,
+ 				               CURVE_PRESET_MAX,
+ 				               CURVEMAP_SLOPE_POS_NEG);
+ 			}
+ 		}
+ 	}
  
 -
 +	{
 +		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;
 +				
 +				brush = &gset->brush[GP_EDITBRUSH_TYPE_CLONE];
 +				brush->size = 50;
 +				brush->strength = 1.0f;
 +			}
 +		}
 +	}
  }