diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:21:07 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:22:03 +0300 |
commit | 4dc91ebf81438c473bbd8f9a1655179335c6d42f (patch) | |
tree | bf254664e6ffcec5e2a4f12417e5a6f0779c4f7e /source/blender/modifiers/intern/MOD_uvproject.c | |
parent | 1813f00b94982727bf545cd4c49ec2d2fee86f7a (diff) | |
parent | c84b8d480196a8c1d18a46c3e704dc9ce88f5c8b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_uvproject.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_uvproject.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 2087a1f7a1a..207c692071c 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -77,8 +77,9 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED( return dataMask; } -static void foreachObjectLink(ModifierData *md, Object *ob, - ObjectWalkFunc walk, void *userData) +static void foreachObjectLink( + ModifierData *md, Object *ob, + ObjectWalkFunc walk, void *userData) { UVProjectModifierData *umd = (UVProjectModifierData *) md; int i; @@ -87,8 +88,9 @@ static void foreachObjectLink(ModifierData *md, Object *ob, walk(userData, ob, &umd->projectors[i], 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) { #if 0 UVProjectModifierData *umd = (UVProjectModifierData *) md; @@ -115,8 +117,9 @@ typedef struct Projector { void *uci; /* optional uv-project info (panorama projection) */ } Projector; -static Mesh *uvprojectModifier_do(UVProjectModifierData *umd, - Object *ob, Mesh *mesh) +static Mesh *uvprojectModifier_do( + UVProjectModifierData *umd, + Object *ob, Mesh *mesh) { float (*coords)[3], (*co)[3]; MLoopUV *mloop_uv; @@ -302,8 +305,9 @@ static Mesh *uvprojectModifier_do(UVProjectModifierData *umd, return mesh; } -static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - Mesh *mesh) +static Mesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + Mesh *mesh) { Mesh *result; UVProjectModifierData *umd = (UVProjectModifierData *) md; |