diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2016-10-21 00:30:54 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2016-10-21 00:40:30 +0300 |
| commit | d74f6b22044a925e57e5f40a2ac132df0d6f8e37 (patch) | |
| tree | 375a6cd018b3adb10dc0ad0a0aa4a8c6a161ec29 /source/blender/modifiers/intern/MOD_smooth.c | |
| parent | 4948b6e226bb0352e0a6ead7dadddc33bb43c908 (diff) | |
| parent | 225edf4e667c12651d2c056b0fbf3a7b17080ff7 (diff) | |
Merge remote-tracking branch 'origin/blender2.8' into pbr-merge
Conflicts:
source/blender/blenloader/intern/versioning_defaults.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/CMakeLists.txt
source/blender/gpu/GPU_framebuffer.h
source/blender/gpu/GPU_material.h
source/blender/gpu/GPU_shader.h
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_framebuffer.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/intern/gpu_shader.c
source/blender/makesdna/DNA_view3d_types.h
Diffstat (limited to 'source/blender/modifiers/intern/MOD_smooth.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_smooth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c index d45c8528510..66c9f613447 100644 --- a/source/blender/modifiers/intern/MOD_smooth.c +++ b/source/blender/modifiers/intern/MOD_smooth.c @@ -34,6 +34,7 @@ #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" #include "BLI_math.h" #include "BLI_utildefines.h" @@ -41,7 +42,6 @@ #include "MEM_guardedalloc.h" #include "BKE_cdderivedmesh.h" -#include "BKE_particle.h" #include "BKE_deform.h" #include "MOD_modifiertypes.h" |