[Bf-blender-cvs] [90d16657387] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonioya]

Commit: 90d16657387e09ea6dab0c768ee11bd5d5aca158
Author: Antonioya
Date:   Tue Dec 11 10:32:10 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB90d16657387e09ea6dab0c768ee11bd5d5aca158

Merge branch 'blender2.8' into greasepencil-object

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

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 7f584fdf613,d10d86de2bc..71e4efec80c
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -2501,21 -2502,20 +2502,35 @@@ void blo_do_versions_280(FileData *fd, 
  			BKE_rigidbody_objects_collection_validate(scene, rbw);
  			BKE_rigidbody_constraints_collection_validate(scene, rbw);
  		}
+ #endif
+ 	}
+ 
+ 	if (!MAIN_VERSION_ATLEAST(bmain, 280, 37)) {
+ 		for (Camera *ca = bmain->camera.first; ca; ca = ca->id.next) {
+ 			ca->drawsize *= 2.0f;
+ 		}
+ 		for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
+ 			if (ob->type != OB_EMPTY) {
+ 				if (UNLIKELY(ob->transflag & OB_DUPLICOLLECTION)) {
+ 					BKE_object_type_set_empty_for_versioning(ob);
+ 				}
+ 			}
+ 		}
 +
 +		/* Grease pencil primitive curve */
 +		if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Settings", "CurveMapping", "cur_primitive")) {
 +			for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 +				GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt;
 +				if ((gset) && (gset->cur_primitive == NULL)) {
 +					gset->cur_primitive = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
 +					curvemapping_initialize(gset->cur_primitive);
 +					curvemap_reset(gset->cur_primitive->cm,
 +						&gset->cur_primitive->clipr,
 +						CURVE_PRESET_BELL,
 +						CURVEMAP_SLOPE_POSITIVE);
 +				}
 +			}
 +		}
  	}
  
  	{