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

[Antonioya]

Commit: f9dbee0cacb00168e6b6d9d4c94ddafd3c20312b
Author: Antonioya
Date:   Mon Dec 10 19:16:07 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBf9dbee0cacb00168e6b6d9d4c94ddafd3c20312b

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 62bd917bdec,b05be55e8fa..7f584fdf613
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -2491,19 -2490,21 +2490,36 @@@ void blo_do_versions_280(FileData *fd, 
  			}
  		}
  
+ 		/* Ensure we get valid rigidbody object/constraint data in relevant collections' objects. */
+ 		for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
+ 			RigidBodyWorld *rbw = scene->rigidbody_world;
+ 
+ 			if (rbw == NULL) {
+ 				continue;
+ 			}
+ 
+ 			BKE_rigidbody_objects_collection_validate(scene, rbw);
+ 			BKE_rigidbody_constraints_collection_validate(scene, rbw);
+ 		}
++
 +		/* 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);
 +				}
 +			}
 +		}
  	}
+ 
+ 	{
+ 		/* Versioning code until next subversion bump goes here. */
+ 
+ 	}
  }