[Bf-blender-cvs] [70534e51067] functions: Merge branch 'master' into functions

[Jacques Lucke]

Commit: 70534e510672957fe2ce5baf250b2ce6e78fa232
Author: Jacques Lucke
Date:   Fri Mar 8 13:12:57 2019 +0100
Branches: functions
https://developer.blender.org/rB70534e510672957fe2ce5baf250b2ce6e78fa232

Merge branch 'master' into functions

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



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

diff --cc source/blender/modifiers/intern/MOD_displace.c
index 662254ca342,87b25982d81..44589cfb7dc
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@@ -65,39 -63,25 +65,40 @@@ static void initData(ModifierData *md
  	dmd->direction = MOD_DISP_DIR_NOR;
  	dmd->midlevel = 0.5;
  	dmd->space = MOD_DISP_SPACE_LOCAL;
 +	dmd->function_tree = NULL;
 +}
 +
 +static FnFunction getCurrentFunction(DisplaceModifierData *dmd)
 +{
 +	bNodeTree *tree = (bNodeTree *)DEG_get_original_id((ID *)dmd->function_tree);
 +
 +	FnType float_ty = FN_type_borrow_float();
 +	FnType int32_ty = FN_type_borrow_int32();
 +	FnType fvec3_ty = FN_type_borrow_fvec3();
 +
 +	FnType inputs[] = { fvec3_ty, int32_ty, NULL };
 +	FnType outputs[] = { float_ty, NULL };
 +
 +	return FN_function_get_with_signature(tree, inputs, outputs);
  }
  
- static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
+ static void requiredDataMask(Object *UNUSED(ob), ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
  {
  	DisplaceModifierData *dmd = (DisplaceModifierData *)md;
- 	CustomDataMask dataMask = 0;
  
  	/* ask for vertexgroups if we need them */
- 	if (dmd->defgrp_name[0]) dataMask |= CD_MASK_MDEFORMVERT;
+ 	if (dmd->defgrp_name[0] != '\0') {
+ 		r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT;
+ 	}
  
  	/* ask for UV coordinates if we need them */
- 	if (dmd->texmapping == MOD_DISP_MAP_UV) dataMask |= CD_MASK_MTFACE;
+ 	if (dmd->texmapping == MOD_DISP_MAP_UV) {
+ 		r_cddata_masks->fmask |= CD_MASK_MTFACE;
+ 	}
  
  	if (dmd->direction == MOD_DISP_DIR_CLNOR) {
- 		dataMask |= CD_MASK_CUSTOMLOOPNORMAL;
+ 		r_cddata_masks->lmask |= CD_MASK_CUSTOMLOOPNORMAL;
  	}
- 
- 	return dataMask;
  }
  
  static bool dependsOnTime(ModifierData *md)