Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/modifiers/intern/MOD_dynamicpaint.c
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/modifiers/intern/MOD_dynamicpaint.c')
-rw-r--r--source/blender/modifiers/intern/MOD_dynamicpaint.c227
1 files changed, 115 insertions, 112 deletions
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index badf3df6b1d..ccd71455b21 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -43,157 +43,160 @@
static void initData(ModifierData *md)
{
- DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md;
+ DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
- pmd->canvas = NULL;
- pmd->brush = NULL;
- pmd->type = MOD_DYNAMICPAINT_TYPE_CANVAS;
+ pmd->canvas = NULL;
+ pmd->brush = NULL;
+ pmd->type = MOD_DYNAMICPAINT_TYPE_CANVAS;
}
static void copyData(const ModifierData *md, ModifierData *target, const int flag)
{
- const DynamicPaintModifierData *pmd = (const DynamicPaintModifierData *)md;
- DynamicPaintModifierData *tpmd = (DynamicPaintModifierData *)target;
+ const DynamicPaintModifierData *pmd = (const DynamicPaintModifierData *)md;
+ DynamicPaintModifierData *tpmd = (DynamicPaintModifierData *)target;
- dynamicPaint_Modifier_copy(pmd, tpmd, flag);
+ dynamicPaint_Modifier_copy(pmd, tpmd, flag);
}
static void freeRuntimeData(void *runtime_data_v)
{
- if (runtime_data_v == NULL) {
- return;
- }
- DynamicPaintRuntime *runtime_data = (DynamicPaintRuntime *)runtime_data_v;
- dynamicPaint_Modifier_free_runtime(runtime_data);
+ if (runtime_data_v == NULL) {
+ return;
+ }
+ DynamicPaintRuntime *runtime_data = (DynamicPaintRuntime *)runtime_data_v;
+ dynamicPaint_Modifier_free_runtime(runtime_data);
}
static void freeData(ModifierData *md)
{
- DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md;
- dynamicPaint_Modifier_free(pmd);
+ DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
+ dynamicPaint_Modifier_free(pmd);
}
-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)
{
- DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
-
- if (pmd->canvas) {
- DynamicPaintSurface *surface = pmd->canvas->surfaces.first;
- for (; surface; surface = surface->next) {
- /* tface */
- if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ ||
- surface->init_color_type == MOD_DPAINT_INITIAL_TEXTURE)
- {
- r_cddata_masks->lmask |= CD_MASK_MLOOPUV;
- }
- /* mcol */
- if (surface->type == MOD_DPAINT_SURFACE_T_PAINT ||
- surface->init_color_type == MOD_DPAINT_INITIAL_VERTEXCOLOR)
- {
- r_cddata_masks->lmask |= CD_MASK_MLOOPCOL;
- }
- /* CD_MDEFORMVERT */
- if (surface->type == MOD_DPAINT_SURFACE_T_WEIGHT) {
- r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT;
- }
- }
- }
+ DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
+
+ if (pmd->canvas) {
+ DynamicPaintSurface *surface = pmd->canvas->surfaces.first;
+ for (; surface; surface = surface->next) {
+ /* tface */
+ if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ ||
+ surface->init_color_type == MOD_DPAINT_INITIAL_TEXTURE) {
+ r_cddata_masks->lmask |= CD_MASK_MLOOPUV;
+ }
+ /* mcol */
+ if (surface->type == MOD_DPAINT_SURFACE_T_PAINT ||
+ surface->init_color_type == MOD_DPAINT_INITIAL_VERTEXCOLOR) {
+ r_cddata_masks->lmask |= CD_MASK_MLOOPCOL;
+ }
+ /* CD_MDEFORMVERT */
+ if (surface->type == MOD_DPAINT_SURFACE_T_WEIGHT) {
+ r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT;
+ }
+ }
+ }
}
-static Mesh *applyModifier(
- ModifierData *md, const ModifierEvalContext *ctx,
- Mesh *mesh)
+static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh)
{
- DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md;
-
- /* dont apply dynamic paint on orco mesh stack */
- if (!(ctx->flag & MOD_APPLY_ORCO)) {
- Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph);
- return dynamicPaint_Modifier_do(pmd, ctx->depsgraph, scene, ctx->object, mesh);
- }
- return mesh;
+ DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
+
+ /* dont apply dynamic paint on orco mesh stack */
+ if (!(ctx->flag & MOD_APPLY_ORCO)) {
+ Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph);
+ return dynamicPaint_Modifier_do(pmd, ctx->depsgraph, scene, ctx->object, mesh);
+ }
+ return mesh;
}
static bool is_brush_cb(Object *UNUSED(ob), ModifierData *pmd)
{
- return ((DynamicPaintModifierData *)pmd)->brush != NULL;
+ return ((DynamicPaintModifierData *)pmd)->brush != NULL;
}
static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphContext *ctx)
{
- DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
- /* Add relation from canvases to all brush objects. */
- if (pmd->canvas != NULL) {
- for (DynamicPaintSurface *surface = pmd->canvas->surfaces.first; surface; surface = surface->next) {
- if (surface->effect & MOD_DPAINT_EFFECT_DO_DRIP) {
- DEG_add_forcefield_relations(ctx->node, ctx->object, surface->effector_weights, true, 0, "Dynamic Paint Field");
- }
-
- /* Actual code uses custom loop over group/scene without layer checks in dynamicPaint_doStep */
- DEG_add_collision_relations(ctx->node, ctx->object, surface->brush_group, eModifierType_DynamicPaint, is_brush_cb, "Dynamic Paint Brush");
- }
- }
+ DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
+ /* Add relation from canvases to all brush objects. */
+ if (pmd->canvas != NULL) {
+ for (DynamicPaintSurface *surface = pmd->canvas->surfaces.first; surface;
+ surface = surface->next) {
+ if (surface->effect & MOD_DPAINT_EFFECT_DO_DRIP) {
+ DEG_add_forcefield_relations(
+ ctx->node, ctx->object, surface->effector_weights, true, 0, "Dynamic Paint Field");
+ }
+
+ /* Actual code uses custom loop over group/scene without layer checks in dynamicPaint_doStep */
+ DEG_add_collision_relations(ctx->node,
+ ctx->object,
+ surface->brush_group,
+ eModifierType_DynamicPaint,
+ is_brush_cb,
+ "Dynamic Paint Brush");
+ }
+ }
}
static bool dependsOnTime(ModifierData *UNUSED(md))
{
- return true;
+ return true;
}
-static void foreachIDLink(
- ModifierData *md, Object *ob,
- IDWalkFunc walk, void *userData)
+static void foreachIDLink(ModifierData *md, Object *ob, IDWalkFunc walk, void *userData)
{
- DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md;
-
- if (pmd->canvas) {
- DynamicPaintSurface *surface = pmd->canvas->surfaces.first;
-
- for (; surface; surface = surface->next) {
- walk(userData, ob, (ID **)&surface->brush_group, IDWALK_CB_NOP);
- walk(userData, ob, (ID **)&surface->init_texture, IDWALK_CB_USER);
- if (surface->effector_weights) {
- walk(userData, ob, (ID **)&surface->effector_weights->group, IDWALK_CB_NOP);
- }
- }
- }
+ DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
+
+ if (pmd->canvas) {
+ DynamicPaintSurface *surface = pmd->canvas->surfaces.first;
+
+ for (; surface; surface = surface->next) {
+ walk(userData, ob, (ID **)&surface->brush_group, IDWALK_CB_NOP);
+ walk(userData, ob, (ID **)&surface->init_texture, IDWALK_CB_USER);
+ if (surface->effector_weights) {
+ walk(userData, ob, (ID **)&surface->effector_weights->group, IDWALK_CB_NOP);
+ }
+ }
+ }
}
-static void foreachTexLink(
- ModifierData *UNUSED(md), Object *UNUSED(ob),
- TexWalkFunc UNUSED(walk), void *UNUSED(userData))
+static void foreachTexLink(ModifierData *UNUSED(md),
+ Object *UNUSED(ob),
+ TexWalkFunc UNUSED(walk),
+ void *UNUSED(userData))
{
- //walk(userData, ob, md, ""); /* re-enable when possible */
+ //walk(userData, ob, md, ""); /* re-enable when possible */
}
ModifierTypeInfo modifierType_DynamicPaint = {
- /* name */ "Dynamic Paint",
- /* structName */ "DynamicPaintModifierData",
- /* structSize */ sizeof(DynamicPaintModifierData),
- /* type */ eModifierTypeType_Constructive,
- /* flags */ eModifierTypeFlag_AcceptsMesh |
-/* eModifierTypeFlag_SupportsMapping |*/
- eModifierTypeFlag_UsesPointCache |
- eModifierTypeFlag_Single |
- eModifierTypeFlag_UsesPreview,
-
- /* copyData */ copyData,
-
- /* deformVerts */ NULL,
- /* deformMatrices */ NULL,
- /* deformVertsEM */ NULL,
- /* deformMatricesEM */ NULL,
- /* applyModifier */ applyModifier,
-
- /* initData */ initData,
- /* requiredDataMask */ requiredDataMask,
- /* freeData */ freeData,
- /* isDisabled */ NULL,
- /* updateDepsgraph */ updateDepsgraph,
- /* dependsOnTime */ dependsOnTime,
- /* dependsOnNormals */ NULL,
- /* foreachObjectLink */ NULL,
- /* foreachIDLink */ foreachIDLink,
- /* foreachTexLink */ foreachTexLink,
- /* freeRuntimeData */ freeRuntimeData,
+ /* name */ "Dynamic Paint",
+ /* structName */ "DynamicPaintModifierData",
+ /* structSize */ sizeof(DynamicPaintModifierData),
+ /* type */ eModifierTypeType_Constructive,
+ /* flags */ eModifierTypeFlag_AcceptsMesh |
+ /* eModifierTypeFlag_SupportsMapping |*/
+ eModifierTypeFlag_UsesPointCache | eModifierTypeFlag_Single |
+ eModifierTypeFlag_UsesPreview,
+
+ /* copyData */ copyData,
+
+ /* deformVerts */ NULL,
+ /* deformMatrices */ NULL,
+ /* deformVertsEM */ NULL,
+ /* deformMatricesEM */ NULL,
+ /* applyModifier */ applyModifier,
+
+ /* initData */ initData,
+ /* requiredDataMask */ requiredDataMask,
+ /* freeData */ freeData,
+ /* isDisabled */ NULL,
+ /* updateDepsgraph */ updateDepsgraph,
+ /* dependsOnTime */ dependsOnTime,
+ /* dependsOnNormals */ NULL,
+ /* foreachObjectLink */ NULL,
+ /* foreachIDLink */ foreachIDLink,
+ /* foreachTexLink */ foreachTexLink,
+ /* freeRuntimeData */ freeRuntimeData,
};