diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:41:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:42:52 +0300 |
| commit | 253dce07d7cccb769d34356fc34c5900f7cd0ec8 (patch) | |
| tree | e4018aaa2b89340d7d2e08cdbcba8ea3ff40b0cc /source/blender/blenkernel/intern/modifier.c | |
| parent | fe52a05e950e474036c80f554a4675f12203695b (diff) | |
| parent | 0cff044d84646c2890f13b8915eb708861bb36d6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/modifier.c')
| -rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index dae941668ca..7462efc268c 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -297,7 +297,7 @@ void modifier_copyData_generic(const ModifierData *md_src, ModifierData *md_dst, { const ModifierTypeInfo *mti = modifierType_getInfo(md_src->type); - /* md_dst may have alredy be fully initialized with some extra allocated data, + /* md_dst may have already be fully initialized with some extra allocated data, * we need to free it now to avoid memleak. */ if (mti->freeData) { mti->freeData(md_dst); @@ -778,7 +778,7 @@ void test_object_modifiers(Object *ob) } } -/* where should this go?, it doesnt fit well anywhere :S - campbell */ +/* where should this go?, it doesn't fit well anywhere :S - campbell */ /* elubie: changed this to default to the same dir as the render output * to prevent saving to C:\ on Windows */ |