1 files changed, 312 insertions, 313 deletions

diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index 0060639970c..b0c633b1cdd 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -21,7 +21,6 @@
  * \ingroup modifiers
  */
 
-
 #include "BLI_utildefines.h"
 
 #include "BLI_math.h"
@@ -51,376 +50,376 @@
 
 #include "RE_shader_ext.h"
 
-
 /* Displace */
 
 static void initData(ModifierData *md)
 {
-	DisplaceModifierData *dmd = (DisplaceModifierData *) md;
+  DisplaceModifierData *dmd = (DisplaceModifierData *)md;
 
-	dmd->texture = NULL;
-	dmd->strength = 1;
-	dmd->direction = MOD_DISP_DIR_NOR;
-	dmd->midlevel = 0.5;
-	dmd->space = MOD_DISP_SPACE_LOCAL;
+  dmd->texture = NULL;
+  dmd->strength = 1;
+  dmd->direction = MOD_DISP_DIR_NOR;
+  dmd->midlevel = 0.5;
+  dmd->space = MOD_DISP_SPACE_LOCAL;
 }
 
-static void requiredDataMask(Object *UNUSED(ob), ModifierData *md, CustomData_MeshMasks *r_cddata_masks)
+static void requiredDataMask(Object *UNUSED(ob),
+                             ModifierData *md,
+                             CustomData_MeshMasks *r_cddata_masks)
 {
-	DisplaceModifierData *dmd = (DisplaceModifierData *)md;
+  DisplaceModifierData *dmd = (DisplaceModifierData *)md;
 
-	/* ask for vertexgroups if we need them */
-	if (dmd->defgrp_name[0] != '\0') {
-		r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT;
-	}
+  /* ask for vertexgroups if we need them */
+  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) {
-		r_cddata_masks->fmask |= CD_MASK_MTFACE;
-	}
+  /* ask for UV coordinates if we need them */
+  if (dmd->texmapping == MOD_DISP_MAP_UV) {
+    r_cddata_masks->fmask |= CD_MASK_MTFACE;
+  }
 
-	if (dmd->direction == MOD_DISP_DIR_CLNOR) {
-		r_cddata_masks->lmask |= CD_MASK_CUSTOMLOOPNORMAL;
-	}
+  if (dmd->direction == MOD_DISP_DIR_CLNOR) {
+    r_cddata_masks->lmask |= CD_MASK_CUSTOMLOOPNORMAL;
+  }
 }
 
 static bool dependsOnTime(ModifierData *md)
 {
-	DisplaceModifierData *dmd = (DisplaceModifierData *)md;
-
-	if (dmd->texture) {
-		return BKE_texture_dependsOnTime(dmd->texture);
-	}
-	else {
-		return false;
-	}
+  DisplaceModifierData *dmd = (DisplaceModifierData *)md;
+
+  if (dmd->texture) {
+    return BKE_texture_dependsOnTime(dmd->texture);
+  }
+  else {
+    return false;
+  }
 }
 
 static bool dependsOnNormals(ModifierData *md)
 {
-	DisplaceModifierData *dmd = (DisplaceModifierData *)md;
-	return ELEM(dmd->direction, MOD_DISP_DIR_NOR, MOD_DISP_DIR_CLNOR);
+  DisplaceModifierData *dmd = (DisplaceModifierData *)md;
+  return ELEM(dmd->direction, MOD_DISP_DIR_NOR, MOD_DISP_DIR_CLNOR);
 }
 
-static void foreachObjectLink(
-        ModifierData *md, Object *ob,
-        ObjectWalkFunc walk, void *userData)
+static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, void *userData)
 {
-	DisplaceModifierData *dmd = (DisplaceModifierData *) md;
+  DisplaceModifierData *dmd = (DisplaceModifierData *)md;
 
-	walk(userData, ob, &dmd->map_object, IDWALK_CB_NOP);
+  walk(userData, ob, &dmd->map_object, IDWALK_CB_NOP);
 }
 
-static void foreachIDLink(
-        ModifierData *md, Object *ob,
-        IDWalkFunc walk, void *userData)
+static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
 {
-	DisplaceModifierData *dmd = (DisplaceModifierData *) md;
+  DisplaceModifierData *dmd = (DisplaceModifierData *)md;
 
-	walk(userData, ob, (ID **)&dmd->texture, IDWALK_CB_USER);
+  walk(userData, ob, (ID **)&dmd->texture, IDWALK_CB_USER);
 
-	foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
+  foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
 }
 
-static void foreachTexLink(
-        ModifierData *md, Object *ob,
-        TexWalkFunc walk, void *userData)
+static void foreachTexLink(ModifierData *md, Object *ob, TexWalkFunc walk, void *userData)
 {
-	walk(userData, ob, md, "texture");
+  walk(userData, ob, md, "texture");
 }
 
-static bool isDisabled(const struct Scene *UNUSED(scene), ModifierData *md, bool UNUSED(useRenderParams))
+static bool isDisabled(const struct Scene *UNUSED(scene),
+                       ModifierData *md,
+                       bool UNUSED(useRenderParams))
 {
-	DisplaceModifierData *dmd = (DisplaceModifierData *) md;
-	return ((!dmd->texture && dmd->direction == MOD_DISP_DIR_RGB_XYZ) || dmd->strength == 0.0f);
+  DisplaceModifierData *dmd = (DisplaceModifierData *)md;
+  return ((!dmd->texture && dmd->direction == MOD_DISP_DIR_RGB_XYZ) || dmd->strength == 0.0f);
 }
 
 static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
 {
-	DisplaceModifierData *dmd = (DisplaceModifierData *)md;
-	if (dmd->map_object != NULL && dmd->texmapping == MOD_DISP_MAP_OBJECT) {
-		DEG_add_modifier_to_transform_relation(ctx->node, "Displace Modifier");
-		DEG_add_object_relation(ctx->node, dmd->map_object, DEG_OB_COMP_TRANSFORM, "Displace Modifier");
-	}
-	if (dmd->texmapping == MOD_DISP_MAP_GLOBAL ||
-	    (ELEM(dmd->direction, MOD_DISP_DIR_X, MOD_DISP_DIR_Y, MOD_DISP_DIR_Z, MOD_DISP_DIR_RGB_XYZ) &&
-	    dmd->space == MOD_DISP_SPACE_GLOBAL))
-	{
-		DEG_add_modifier_to_transform_relation(ctx->node, "Displace Modifier");
-	}
-	if (dmd->texture != NULL) {
-		DEG_add_generic_id_relation(ctx->node, &dmd->texture->id, "Displace Modifier");
-	}
+  DisplaceModifierData *dmd = (DisplaceModifierData *)md;
+  if (dmd->map_object != NULL && dmd->texmapping == MOD_DISP_MAP_OBJECT) {
+    DEG_add_modifier_to_transform_relation(ctx->node, "Displace Modifier");
+    DEG_add_object_relation(
+        ctx->node, dmd->map_object, DEG_OB_COMP_TRANSFORM, "Displace Modifier");
+  }
+  if (dmd->texmapping == MOD_DISP_MAP_GLOBAL ||
+      (ELEM(
+           dmd->direction, MOD_DISP_DIR_X, MOD_DISP_DIR_Y, MOD_DISP_DIR_Z, MOD_DISP_DIR_RGB_XYZ) &&
+       dmd->space == MOD_DISP_SPACE_GLOBAL)) {
+    DEG_add_modifier_to_transform_relation(ctx->node, "Displace Modifier");
+  }
+  if (dmd->texture != NULL) {
+    DEG_add_generic_id_relation(ctx->node, &dmd->texture->id, "Displace Modifier");
+  }
 }
 
 typedef struct DisplaceUserdata {
-	/*const*/ DisplaceModifierData *dmd;
-	struct Scene *scene;
-	struct ImagePool *pool;
-	MDeformVert *dvert;
-	float weight;
-	int defgrp_index;
-	int direction;
-	bool use_global_direction;
-	Tex *tex_target;
-	float (*tex_co)[3];
-	float (*vertexCos)[3];
-	float local_mat[4][4];
-	MVert *mvert;
-	float (*vert_clnors)[3];
+  /*const*/ DisplaceModifierData *dmd;
+  struct Scene *scene;
+  struct ImagePool *pool;
+  MDeformVert *dvert;
+  float weight;
+  int defgrp_index;
+  int direction;
+  bool use_global_direction;
+  Tex *tex_target;
+  float (*tex_co)[3];
+  float (*vertexCos)[3];
+  float local_mat[4][4];
+  MVert *mvert;
+  float (*vert_clnors)[3];
 } DisplaceUserdata;
 
-static void displaceModifier_do_task(
-        void *__restrict userdata,
-        const int iter,
-        const ParallelRangeTLS *__restrict UNUSED(tls))
+static void displaceModifier_do_task(void *__restrict userdata,
+                                     const int iter,
+                                     const ParallelRangeTLS *__restrict UNUSED(tls))
 {
-	DisplaceUserdata *data = (DisplaceUserdata *)userdata;
-	DisplaceModifierData *dmd = data->dmd;
-	MDeformVert *dvert = data->dvert;
-	float weight = data->weight;
-	int defgrp_index = data->defgrp_index;
-	int direction = data->direction;
-	bool use_global_direction = data->use_global_direction;
-	float (*tex_co)[3] = data->tex_co;
-	float (*vertexCos)[3] = data->vertexCos;
-	MVert *mvert = data->mvert;
-	float (*vert_clnors)[3] = data->vert_clnors;
-
-	const float delta_fixed = 1.0f - dmd->midlevel;  /* when no texture is used, we fallback to white */
-
-	TexResult texres;
-	float strength = dmd->strength;
-	float delta;
-	float local_vec[3];
-
-	if (dvert) {
-		weight = defvert_find_weight(dvert + iter, defgrp_index);
-		if (weight == 0.0f) {
-			return;
-		}
-	}
-
-	if (data->tex_target) {
-		texres.nor = NULL;
-		BKE_texture_get_value_ex(data->scene, data->tex_target, tex_co[iter], &texres, data->pool, false);
-		delta = texres.tin - dmd->midlevel;
-	}
-	else {
-		delta = delta_fixed;  /* (1.0f - dmd->midlevel) */  /* never changes */
-	}
-
-	if (dvert) {
-		strength *= weight;
-	}
-
-	delta *= strength;
-	CLAMP(delta, -10000, 10000);
-
-	switch (direction) {
-		case MOD_DISP_DIR_X:
-			if (use_global_direction) {
-				vertexCos[iter][0] += delta * data->local_mat[0][0];
-				vertexCos[iter][1] += delta * data->local_mat[1][0];
-				vertexCos[iter][2] += delta * data->local_mat[2][0];
-			}
-			else {
-				vertexCos[iter][0] += delta;
-			}
-			break;
-		case MOD_DISP_DIR_Y:
-			if (use_global_direction) {
-				vertexCos[iter][0] += delta * data->local_mat[0][1];
-				vertexCos[iter][1] += delta * data->local_mat[1][1];
-				vertexCos[iter][2] += delta * data->local_mat[2][1];
-			}
-			else {
-				vertexCos[iter][1] += delta;
-			}
-			break;
-		case MOD_DISP_DIR_Z:
-			if (use_global_direction) {
-				vertexCos[iter][0] += delta * data->local_mat[0][2];
-				vertexCos[iter][1] += delta * data->local_mat[1][2];
-				vertexCos[iter][2] += delta * data->local_mat[2][2];
-			}
-			else {
-				vertexCos[iter][2] += delta;
-			}
-			break;
-		case MOD_DISP_DIR_RGB_XYZ:
-			local_vec[0] = texres.tr - dmd->midlevel;
-			local_vec[1] = texres.tg - dmd->midlevel;
-			local_vec[2] = texres.tb - dmd->midlevel;
-			if (use_global_direction) {
-				mul_transposed_mat3_m4_v3(data->local_mat, local_vec);
-			}
-			mul_v3_fl(local_vec, strength);
-			add_v3_v3(vertexCos[iter], local_vec);
-			break;
-		case MOD_DISP_DIR_NOR:
-			vertexCos[iter][0] += delta * (mvert[iter].no[0] / 32767.0f);
-			vertexCos[iter][1] += delta * (mvert[iter].no[1] / 32767.0f);
-			vertexCos[iter][2] += delta * (mvert[iter].no[2] / 32767.0f);
-			break;
-		case MOD_DISP_DIR_CLNOR:
-			madd_v3_v3fl(vertexCos[iter], vert_clnors[iter], delta);
-			break;
-	}
+  DisplaceUserdata *data = (DisplaceUserdata *)userdata;
+  DisplaceModifierData *dmd = data->dmd;
+  MDeformVert *dvert = data->dvert;
+  float weight = data->weight;
+  int defgrp_index = data->defgrp_index;
+  int direction = data->direction;
+  bool use_global_direction = data->use_global_direction;
+  float(*tex_co)[3] = data->tex_co;
+  float(*vertexCos)[3] = data->vertexCos;
+  MVert *mvert = data->mvert;
+  float(*vert_clnors)[3] = data->vert_clnors;
+
+  const float delta_fixed = 1.0f -
+                            dmd->midlevel; /* when no texture is used, we fallback to white */
+
+  TexResult texres;
+  float strength = dmd->strength;
+  float delta;
+  float local_vec[3];
+
+  if (dvert) {
+    weight = defvert_find_weight(dvert + iter, defgrp_index);
+    if (weight == 0.0f) {
+      return;
+    }
+  }
+
+  if (data->tex_target) {
+    texres.nor = NULL;
+    BKE_texture_get_value_ex(
+        data->scene, data->tex_target, tex_co[iter], &texres, data->pool, false);
+    delta = texres.tin - dmd->midlevel;
+  }
+  else {
+    delta = delta_fixed; /* (1.0f - dmd->midlevel) */ /* never changes */
+  }
+
+  if (dvert) {
+    strength *= weight;
+  }
+
+  delta *= strength;
+  CLAMP(delta, -10000, 10000);
+
+  switch (direction) {
+    case MOD_DISP_DIR_X:
+      if (use_global_direction) {
+        vertexCos[iter][0] += delta * data->local_mat[0][0];
+        vertexCos[iter][1] += delta * data->local_mat[1][0];
+        vertexCos[iter][2] += delta * data->local_mat[2][0];
+      }
+      else {
+        vertexCos[iter][0] += delta;
+      }
+      break;
+    case MOD_DISP_DIR_Y:
+      if (use_global_direction) {
+        vertexCos[iter][0] += delta * data->local_mat[0][1];
+        vertexCos[iter][1] += delta * data->local_mat[1][1];
+        vertexCos[iter][2] += delta * data->local_mat[2][1];
+      }
+      else {
+        vertexCos[iter][1] += delta;
+      }
+      break;
+    case MOD_DISP_DIR_Z:
+      if (use_global_direction) {
+        vertexCos[iter][0] += delta * data->local_mat[0][2];
+        vertexCos[iter][1] += delta * data->local_mat[1][2];
+        vertexCos[iter][2] += delta * data->local_mat[2][2];
+      }
+      else {
+        vertexCos[iter][2] += delta;
+      }
+      break;
+    case MOD_DISP_DIR_RGB_XYZ:
+      local_vec[0] = texres.tr - dmd->midlevel;
+      local_vec[1] = texres.tg - dmd->midlevel;
+      local_vec[2] = texres.tb - dmd->midlevel;
+      if (use_global_direction) {
+        mul_transposed_mat3_m4_v3(data->local_mat, local_vec);
+      }
+      mul_v3_fl(local_vec, strength);
+      add_v3_v3(vertexCos[iter], local_vec);
+      break;
+    case MOD_DISP_DIR_NOR:
+      vertexCos[iter][0] += delta * (mvert[iter].no[0] / 32767.0f);
+      vertexCos[iter][1] += delta * (mvert[iter].no[1] / 32767.0f);
+      vertexCos[iter][2] += delta * (mvert[iter].no[2] / 32767.0f);
+      break;
+    case MOD_DISP_DIR_CLNOR:
+      madd_v3_v3fl(vertexCos[iter], vert_clnors[iter], delta);
+      break;
+  }
 }
 
-static void displaceModifier_do(
-        DisplaceModifierData *dmd, const ModifierEvalContext *ctx,
-        Mesh *mesh, float (*vertexCos)[3], const int numVerts)
+static void displaceModifier_do(DisplaceModifierData *dmd,
+                                const ModifierEvalContext *ctx,
+                                Mesh *mesh,
+                                float (*vertexCos)[3],
+                                const int numVerts)
 {
-	Object *ob = ctx->object;
-	MVert *mvert;
-	MDeformVert *dvert;
-	int direction = dmd->direction;
-	int defgrp_index;
-	float (*tex_co)[3];
-	float weight = 1.0f; /* init value unused but some compilers may complain */
-	float (*vert_clnors)[3] = NULL;
-	float local_mat[4][4] = {{0}};
-	const bool use_global_direction = dmd->space == MOD_DISP_SPACE_GLOBAL;
-
-	if (dmd->texture == NULL && dmd->direction == MOD_DISP_DIR_RGB_XYZ) return;
-	if (dmd->strength == 0.0f) return;
-
-	mvert = mesh->mvert;
-	MOD_get_vgroup(ob, mesh, dmd->defgrp_name, &dvert, &defgrp_index);
-
-	Tex *tex_target = dmd->texture;
-	if (tex_target != NULL) {
-		tex_co = MEM_calloc_arrayN((size_t)numVerts, sizeof(*tex_co),
-		                     "displaceModifier_do tex_co");
-		MOD_get_texture_coords((MappingInfoModifierData *)dmd, ctx, ob, mesh, vertexCos, tex_co);
-
-		MOD_init_texture((MappingInfoModifierData *)dmd, ctx);
-	}
-	else {
-		tex_co = NULL;
-	}
-
-	if (direction == MOD_DISP_DIR_CLNOR) {
-		CustomData *ldata = &mesh->ldata;
-
-		if (CustomData_has_layer(ldata, CD_CUSTOMLOOPNORMAL)) {
-			float (*clnors)[3] = NULL;
-
-			if ((mesh->runtime.cd_dirty_vert & CD_MASK_NORMAL) || !CustomData_has_layer(ldata, CD_NORMAL)) {
-				BKE_mesh_calc_normals_split(mesh);
-			}
-
-			clnors = CustomData_get_layer(ldata, CD_NORMAL);
-			vert_clnors = MEM_malloc_arrayN(numVerts, sizeof(*vert_clnors), __func__);
-			BKE_mesh_normals_loop_to_vertex(numVerts, mesh->mloop, mesh->totloop,
-			                                (const float (*)[3])clnors, vert_clnors);
-		}
-		else {
-			direction = MOD_DISP_DIR_NOR;
-		}
-	}
-	else if (ELEM(direction, MOD_DISP_DIR_X, MOD_DISP_DIR_Y, MOD_DISP_DIR_Z, MOD_DISP_DIR_RGB_XYZ) &&
-	         use_global_direction)
-	{
-		copy_m4_m4(local_mat, ob->obmat);
-	}
-
-	DisplaceUserdata data = {NULL};
-	data.scene = DEG_get_evaluated_scene(ctx->depsgraph);
-	data.dmd = dmd;
-	data.dvert = dvert;
-	data.weight = weight;
-	data.defgrp_index = defgrp_index;
-	data.direction = direction;
-	data.use_global_direction = use_global_direction;
-	data.tex_target = tex_target;
-	data.tex_co = tex_co;
-	data.vertexCos = vertexCos;
-	copy_m4_m4(data.local_mat, local_mat);
-	data.mvert = mvert;
-	data.vert_clnors = vert_clnors;
-	if (tex_target != NULL) {
-		data.pool = BKE_image_pool_new();
-		BKE_texture_fetch_images_for_pool(tex_target, data.pool);
-	}
-	ParallelRangeSettings settings;
-	BLI_parallel_range_settings_defaults(&settings);
-	settings.use_threading = (numVerts > 512);
-	BLI_task_parallel_range(0, numVerts,
-	                        &data,
-	                        displaceModifier_do_task,
-	                        &settings);
-
-	if (data.pool != NULL) {
-		BKE_image_pool_free(data.pool);
-	}
-
-	if (tex_co) {
-		MEM_freeN(tex_co);
-	}
-
-	if (vert_clnors) {
-		MEM_freeN(vert_clnors);
-	}
+  Object *ob = ctx->object;
+  MVert *mvert;
+  MDeformVert *dvert;
+  int direction = dmd->direction;
+  int defgrp_index;
+  float(*tex_co)[3];
+  float weight = 1.0f; /* init value unused but some compilers may complain */
+  float(*vert_clnors)[3] = NULL;
+  float local_mat[4][4] = {{0}};
+  const bool use_global_direction = dmd->space == MOD_DISP_SPACE_GLOBAL;
+
+  if (dmd->texture == NULL && dmd->direction == MOD_DISP_DIR_RGB_XYZ)
+    return;
+  if (dmd->strength == 0.0f)
+    return;
+
+  mvert = mesh->mvert;
+  MOD_get_vgroup(ob, mesh, dmd->defgrp_name, &dvert, &defgrp_index);
+
+  Tex *tex_target = dmd->texture;
+  if (tex_target != NULL) {
+    tex_co = MEM_calloc_arrayN((size_t)numVerts, sizeof(*tex_co), "displaceModifier_do tex_co");
+    MOD_get_texture_coords((MappingInfoModifierData *)dmd, ctx, ob, mesh, vertexCos, tex_co);
+
+    MOD_init_texture((MappingInfoModifierData *)dmd, ctx);
+  }
+  else {
+    tex_co = NULL;
+  }
+
+  if (direction == MOD_DISP_DIR_CLNOR) {
+    CustomData *ldata = &mesh->ldata;
+
+    if (CustomData_has_layer(ldata, CD_CUSTOMLOOPNORMAL)) {
+      float(*clnors)[3] = NULL;
+
+      if ((mesh->runtime.cd_dirty_vert & CD_MASK_NORMAL) ||
+          !CustomData_has_layer(ldata, CD_NORMAL)) {
+        BKE_mesh_calc_normals_split(mesh);
+      }
+
+      clnors = CustomData_get_layer(ldata, CD_NORMAL);
+      vert_clnors = MEM_malloc_arrayN(numVerts, sizeof(*vert_clnors), __func__);
+      BKE_mesh_normals_loop_to_vertex(
+          numVerts, mesh->mloop, mesh->totloop, (const float(*)[3])clnors, vert_clnors);
+    }
+    else {
+      direction = MOD_DISP_DIR_NOR;
+    }
+  }
+  else if (ELEM(direction, MOD_DISP_DIR_X, MOD_DISP_DIR_Y, MOD_DISP_DIR_Z, MOD_DISP_DIR_RGB_XYZ) &&
+           use_global_direction) {
+    copy_m4_m4(local_mat, ob->obmat);
+  }
+
+  DisplaceUserdata data = {NULL};
+  data.scene = DEG_get_evaluated_scene(ctx->depsgraph);
+  data.dmd = dmd;
+  data.dvert = dvert;
+  data.weight = weight;
+  data.defgrp_index = defgrp_index;
+  data.direction = direction;
+  data.use_global_direction = use_global_direction;
+  data.tex_target = tex_target;
+  data.tex_co = tex_co;
+  data.vertexCos = vertexCos;
+  copy_m4_m4(data.local_mat, local_mat);
+  data.mvert = mvert;
+  data.vert_clnors = vert_clnors;
+  if (tex_target != NULL) {
+    data.pool = BKE_image_pool_new();
+    BKE_texture_fetch_images_for_pool(tex_target, data.pool);
+  }
+  ParallelRangeSettings settings;
+  BLI_parallel_range_settings_defaults(&settings);
+  settings.use_threading = (numVerts > 512);
+  BLI_task_parallel_range(0, numVerts, &data, displaceModifier_do_task, &settings);
+
+  if (data.pool != NULL) {
+    BKE_image_pool_free(data.pool);
+  }
+
+  if (tex_co) {
+    MEM_freeN(tex_co);
+  }
+
+  if (vert_clnors) {
+    MEM_freeN(vert_clnors);
+  }
 }
 
-static void deformVerts(
-        ModifierData *md,
-        const ModifierEvalContext *ctx,
-        Mesh *mesh,
-        float (*vertexCos)[3],
-        int numVerts)
+static void deformVerts(ModifierData *md,
+                        const ModifierEvalContext *ctx,
+                        Mesh *mesh,
+                        float (*vertexCos)[3],
+                        int numVerts)
 {
-	Mesh *mesh_src = MOD_deform_mesh_eval_get(ctx->object, NULL, mesh, NULL, numVerts, false, false);
+  Mesh *mesh_src = MOD_deform_mesh_eval_get(ctx->object, NULL, mesh, NULL, numVerts, false, false);
 
-	displaceModifier_do((DisplaceModifierData *)md, ctx, mesh_src, vertexCos, numVerts);
+  displaceModifier_do((DisplaceModifierData *)md, ctx, mesh_src, vertexCos, numVerts);
 
-	if (!ELEM(mesh_src, NULL, mesh)) {
-		BKE_id_free(NULL, mesh_src);
-	}
+  if (!ELEM(mesh_src, NULL, mesh)) {
+    BKE_id_free(NULL, mesh_src);
+  }
 }
 
-static void deformVertsEM(
-        ModifierData *md, const ModifierEvalContext *ctx, struct BMEditMesh *editData,
-        Mesh *mesh, float (*vertexCos)[3], int numVerts)
+static void deformVertsEM(ModifierData *md,
+                          const ModifierEvalContext *ctx,
+                          struct BMEditMesh *editData,
+                          Mesh *mesh,
+                          float (*vertexCos)[3],
+                          int numVerts)
 {
-	Mesh *mesh_src = MOD_deform_mesh_eval_get(ctx->object, editData, mesh, NULL, numVerts, false, false);
+  Mesh *mesh_src = MOD_deform_mesh_eval_get(
+      ctx->object, editData, mesh, NULL, numVerts, false, false);
 
-	displaceModifier_do((DisplaceModifierData *)md, ctx, mesh_src, vertexCos, numVerts);
+  displaceModifier_do((DisplaceModifierData *)md, ctx, mesh_src, vertexCos, numVerts);
 
-	if (!ELEM(mesh_src, NULL, mesh)) {
-		BKE_id_free(NULL, mesh_src);
-	}
+  if (!ELEM(mesh_src, NULL, mesh)) {
+    BKE_id_free(NULL, mesh_src);
+  }
 }
 
-
 ModifierTypeInfo modifierType_Displace = {
-	/* name */              "Displace",
-	/* structName */        "DisplaceModifierData",
-	/* structSize */        sizeof(DisplaceModifierData),
-	/* type */              eModifierTypeType_OnlyDeform,
-	/* flags */             eModifierTypeFlag_AcceptsMesh |
-	                        eModifierTypeFlag_SupportsEditmode,
-
-	/* copyData */          modifier_copyData_generic,
-
-	/* deformVerts */       deformVerts,
-	/* deformMatrices */    NULL,
-	/* deformVertsEM */     deformVertsEM,
-	/* deformMatricesEM */  NULL,
-	/* applyModifier */     NULL,
-
-	/* initData */          initData,
-	/* requiredDataMask */  requiredDataMask,
-	/* freeData */          NULL,
-	/* isDisabled */        isDisabled,
-	/* updateDepsgraph */   updateDepsgraph,
-	/* dependsOnTime */     dependsOnTime,
-	/* dependsOnNormals */	dependsOnNormals,
-	/* foreachObjectLink */ foreachObjectLink,
-	/* foreachIDLink */     foreachIDLink,
-	/* foreachTexLink */    foreachTexLink,
-	/* freeRuntimeData */   NULL,
+    /* name */ "Displace",
+    /* structName */ "DisplaceModifierData",
+    /* structSize */ sizeof(DisplaceModifierData),
+    /* type */ eModifierTypeType_OnlyDeform,
+    /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode,
+
+    /* copyData */ modifier_copyData_generic,
+
+    /* deformVerts */ deformVerts,
+    /* deformMatrices */ NULL,
+    /* deformVertsEM */ deformVertsEM,
+    /* deformMatricesEM */ NULL,
+    /* applyModifier */ NULL,
+
+    /* initData */ initData,
+    /* requiredDataMask */ requiredDataMask,
+    /* freeData */ NULL,
+    /* isDisabled */ isDisabled,
+    /* updateDepsgraph */ updateDepsgraph,
+    /* dependsOnTime */ dependsOnTime,
+    /* dependsOnNormals */ dependsOnNormals,
+    /* foreachObjectLink */ foreachObjectLink,
+    /* foreachIDLink */ foreachIDLink,
+    /* foreachTexLink */ foreachTexLink,
+    /* freeRuntimeData */ NULL,
 };