diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
| commit | 18d87e79e92e0cb4792ba3cb42c4ea84fcd29d90 (patch) | |
| tree | b35fd8ad683c79a5cbd9f8419220ee1892cd9ef8 /source/blender/modifiers | |
| parent | 332548753008f941d920c8a9ee1079dbf1895d37 (diff) | |
| parent | b3727668168075137f2ded11d7a7821548e4451d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_fluidsim_util.h | 1 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_subsurf.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.h b/source/blender/modifiers/intern/MOD_fluidsim_util.h index 3329e6dbebe..0a0c8419a99 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.h +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.h @@ -49,4 +49,3 @@ struct DerivedMesh *fluidsimModifier_do( struct DerivedMesh *dm); #endif - diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index 63c6f16449d..3de04e878ac 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -236,4 +236,3 @@ ModifierTypeInfo modifierType_Subsurf = { /* foreachIDLink */ NULL, /* foreachTexLink */ NULL, }; - |