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

[Brecht Van Lommel]

Commit: 253dce07d7cccb769d34356fc34c5900f7cd0ec8
Author: Brecht Van Lommel
Date:   Mon Sep 24 17:41:46 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB253dce07d7cccb769d34356fc34c5900f7cd0ec8

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/dynamicpaint.c
index 4cea52ea792,661c802d64e..9f2ebab6bd9
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@@ -1961,13 -1985,12 +1961,13 @@@ static Mesh *dynamicPaint_Modifier_appl
  							/* Save preview results to weight layer to be
  							 * able to share same drawing methods.
  							 * Note this func also sets DM_DIRTY_TESS_CDLAYERS flag! */
 -							DM_update_weight_mcol(ob, result, 0, weight, 0, NULL);
 +							//TODO port this function
 +							//DM_update_weight_mcol(ob, result, 0, weight, 0, NULL);
  						}
  
- 						/* apply weights into a vertex group, if doesnt exists add a new layer */
+ 						/* apply weights into a vertex group, if doesn't exists add a new layer */
  						if (defgrp_index != -1 && !dvert && (surface->output_name[0] != '\0')) {
 -							dvert = CustomData_add_layer(&result->vertData, CD_MDEFORMVERT, CD_CALLOC,
 +							dvert = CustomData_add_layer(&result->vdata, CD_MDEFORMVERT, CD_CALLOC,
  							                             NULL, sData->total_points);
  						}
  						if (defgrp_index != -1 && dvert) {
diff --cc source/blender/blenkernel/intern/object_dupli.c
index 73cb31146b8,a3fb9981880..6d9520dad1e
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@@ -232,19 -239,23 +232,19 @@@ static bool is_child(const Object *ob, 
  static void make_child_duplis(const DupliContext *ctx, void *userdata, MakeChildDuplisFunc make_child_duplis_cb)
  {
  	Object *parent = ctx->object;
 -	Object *obedit = ctx->scene->obedit;
 -
 -	if (ctx->group) {
 -		unsigned int lay = ctx->group->layer;
 -		int groupid = 0;
 -		GroupObject *go;
 -		for (go = ctx->group->gobject.first; go; go = go->next, groupid++) {
 -			Object *ob = go->ob;
  
 -			if ((ob->lay & lay) && ob != obedit && is_child(ob, parent)) {
 +	if (ctx->collection) {
 +		eEvaluationMode mode = DEG_get_mode(ctx->depsgraph);
 +		FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN(ctx->collection, ob, mode)
 +		{
 +			if ((ob != ctx->obedit) && is_child(ob, parent)) {
  				DupliContext pctx;
 -				copy_dupli_context(&pctx, ctx, ctx->object, NULL, groupid, false);
 +				copy_dupli_context(&pctx, ctx, ctx->object, NULL, _base_id);
  
  				/* mballs have a different dupli handling */
 -				if (ob->type != OB_MBALL)
 +				if (ob->type != OB_MBALL) {
- 					ob->flag |= OB_DONE;  /* doesnt render */
+ 					ob->flag |= OB_DONE;  /* doesn't render */
 -
 +				}
  				make_child_duplis_cb(&pctx, userdata, ob);
  			}
  		}
@@@ -261,7 -273,7 +261,7 @@@
  
  				/* mballs have a different dupli handling */
  				if (ob->type != OB_MBALL)
--					ob->flag |= OB_DONE;  /* doesnt render */
++					ob->flag |= OB_DONE;  /* doesn't render */
  
  				make_child_duplis_cb(&pctx, userdata, ob);
  			}