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:
authorJacques Lucke <mail@jlucke.com>2019-12-12 13:17:04 +0300
committerJacques Lucke <mail@jlucke.com>2019-12-12 13:17:04 +0300
commitee52b2f7d8dde3e9ed56925776d7ad2551388ca0 (patch)
tree3468488adf3636dccbf8e1f5395e15cc92617e0b /source/blender/modifiers/MOD_modifiertypes.h
parent6d3cd34bd518220f3fa3bc9bc687836a490fcb8b (diff)
parent059f7413c4cf2fed8a4189ade4a609f9758f6022 (diff)
Merge branch 'master' into functions
Diffstat (limited to 'source/blender/modifiers/MOD_modifiertypes.h')
-rw-r--r--source/blender/modifiers/MOD_modifiertypes.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/modifiers/MOD_modifiertypes.h b/source/blender/modifiers/MOD_modifiertypes.h
index 10f8d83b5bc..0560ed86c75 100644
--- a/source/blender/modifiers/MOD_modifiertypes.h
+++ b/source/blender/modifiers/MOD_modifiertypes.h
@@ -75,6 +75,7 @@ extern ModifierTypeInfo modifierType_UVWarp;
extern ModifierTypeInfo modifierType_MeshCache;
extern ModifierTypeInfo modifierType_LaplacianDeform;
extern ModifierTypeInfo modifierType_Wireframe;
+extern ModifierTypeInfo modifierType_Weld;
extern ModifierTypeInfo modifierType_DataTransfer;
extern ModifierTypeInfo modifierType_NormalEdit;
extern ModifierTypeInfo modifierType_CorrectiveSmooth;