diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:10:42 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-06-29 18:10:42 +0300 |
commit | 58d6cbba6da31db8dc8a2b42d528b9a353081904 (patch) | |
tree | 04b57a2f809c6f08d84a082edf061f3ece631860 /source/blender/modifiers/intern/MOD_util.c | |
parent | 94549adec4b6857fb6ec4cf77606da51ff7c26b7 (diff) | |
parent | 295d0c52a26730edc6d4ed1276e4051cce006be5 (diff) |
Merge branch 'master' into temp-ghash-setopstemp-ghash-setops
Diffstat (limited to 'source/blender/modifiers/intern/MOD_util.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index c23c22b5fec..be6f7af7791 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -59,7 +59,7 @@ #include "BLI_threads.h" #endif -void modifier_init_texture(Scene *scene, Tex *tex) +void modifier_init_texture(const Scene *scene, Tex *tex) { if (!tex) return; @@ -306,5 +306,6 @@ void modifier_type_init(ModifierTypeInfo *types[]) INIT_TYPE(Wireframe); INIT_TYPE(DataTransfer); INIT_TYPE(NormalEdit); + INIT_TYPE(CorrectiveSmooth); #undef INIT_TYPE } |