diff options
author | Joseph Eagar <joeedh@gmail.com> | 2020-12-21 12:08:24 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2020-12-21 12:08:24 +0300 |
commit | b3fff9b07aa32dd9421143aeed1a941632f55322 (patch) | |
tree | aff29045c84bb609d2bdfa0b926d35a4004983a1 /source/blender/modifiers/intern/MOD_uvwarp.c | |
parent | 681e2b6134e8142d258fcbaafab0c8d9b19fac69 (diff) | |
parent | 84cc00f3b68e12209e000008f992fad3ac48f757 (diff) |
Merge remote-tracking branch 'origin/master' into temp_bmesh_multires
Also redid vcol boundary tool icon, and made a little icon for sculpt
color paint.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_uvwarp.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_uvwarp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_uvwarp.c b/source/blender/modifiers/intern/MOD_uvwarp.c index 10b011360b6..cc845854956 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.c +++ b/source/blender/modifiers/intern/MOD_uvwarp.c @@ -357,7 +357,7 @@ ModifierTypeInfo modifierType_UVWarp = { /* deformMatricesEM */ NULL, /* modifyMesh */ modifyMesh, /* modifyHair */ NULL, - /* modifyPointCloud */ NULL, + /* modifyGeometrySet */ NULL, /* modifyVolume */ NULL, /* initData */ initData, |