[Bf-blender-cvs] [8ccb27fc0ad] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 8ccb27fc0ad45661f627aff552a0a9615633dea7
Author: Bastien Montagne
Date:   Wed Oct 24 09:00:13 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB8ccb27fc0ad45661f627aff552a0a9615633dea7

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/intern/scene.c

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



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

diff --cc source/blender/blenkernel/intern/scene.c
index c16adabbc8c,3a067221aad..8fdf207ad68
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@@ -400,9 -399,10 +400,10 @@@ Scene *BKE_scene_copy(Main *bmain, Scen
  
  		if (type == SCE_COPY_FULL) {
  			/* Copy Freestyle LineStyle datablocks. */
 -			for (SceneRenderLayer *srl_dst = sce_copy->r.layers.first; srl_dst; srl_dst = srl_dst->next) {
 -				for (FreestyleLineSet *lineset = srl_dst->freestyleConfig.linesets.first; lineset; lineset = lineset->next) {
 +			for (ViewLayer *view_layer_dst = sce_copy->view_layers.first; view_layer_dst; view_layer_dst = view_layer_dst->next) {
 +				for (FreestyleLineSet *lineset = view_layer_dst->freestyle_config.linesets.first; lineset; lineset = lineset->next) {
  					if (lineset->linestyle) {
+ 						id_us_min(&lineset->linestyle->id);
  						/* XXX Not copying anim/actions here? */
  						BKE_id_copy_ex(bmain, (ID *)lineset->linestyle, (ID **)&lineset->linestyle, 0, false);
  					}
@@@ -431,9 -430,10 +434,10 @@@
  		}
  
  		/* NOTE: part of SCE_COPY_LINK_DATA and SCE_COPY_FULL operations
 -		 * are done outside of blenkernel with ED_objects_single_users! */
 +		 * are done outside of blenkernel with ED_object_single_users! */
  
- 		/*  camera   */
+ 		/*  camera */
+ 		/* XXX This is most certainly useless? Object have not yet been duplicated... */
  		if (ELEM(type, SCE_COPY_LINK_DATA, SCE_COPY_FULL)) {
  			ID_NEW_REMAP(sce_copy->camera);
  		}