Merge 'master' into 'functions'

1 files changed, 106 insertions, 106 deletions

diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index f04abb1d653..c731e8a4389 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -19,140 +19,140 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-	.
-	intern
-	../blenkernel
-	../blenlib
-	../blenfont
-	../depsgraph
-	../makesdna
-	../makesrna
-	../bmesh
-	../functions
-	../render/extern/include
-	../../../intern/elbeem/extern
-	../../../intern/guardedalloc
-	../../../intern/eigen
+  .
+  intern
+  ../blenkernel
+  ../blenlib
+  ../blenfont
+  ../depsgraph
+  ../makesdna
+  ../makesrna
+  ../bmesh
+  ../functions
+  ../render/extern/include
+  ../../../intern/elbeem/extern
+  ../../../intern/guardedalloc
+  ../../../intern/eigen
 )
 
 set(INC_SYS
-	${ZLIB_INCLUDE_DIRS}
+  ${ZLIB_INCLUDE_DIRS}
 )
 
 set(SRC
-	intern/MOD_armature.c
-	intern/MOD_array.c
-	intern/MOD_bevel.c
-	intern/MOD_boolean.c
-	intern/MOD_build.c
-	intern/MOD_cast.c
-	intern/MOD_cloth.c
-	intern/MOD_collision.c
-	intern/MOD_correctivesmooth.c
-	intern/MOD_curve.c
-	intern/MOD_datatransfer.c
-	intern/MOD_decimate.c
-	intern/MOD_displace.c
-	intern/MOD_dynamicpaint.c
-	intern/MOD_edgesplit.c
-	intern/MOD_explode.c
-	intern/MOD_fluidsim.c
-	intern/MOD_fluidsim_util.c
-	intern/MOD_functiondeform.c
-	intern/MOD_functionpoints.c
-	intern/MOD_hook.c
-	intern/MOD_laplaciandeform.c
-	intern/MOD_laplaciansmooth.c
-	intern/MOD_lattice.c
-	intern/MOD_mask.c
-	intern/MOD_meshcache.c
-	intern/MOD_meshcache_mdd.c
-	intern/MOD_meshcache_pc2.c
-	intern/MOD_meshcache_util.c
-	intern/MOD_meshdeform.c
-	intern/MOD_meshsequencecache.c
-	intern/MOD_mirror.c
-	intern/MOD_multires.c
-	intern/MOD_none.c
-	intern/MOD_normal_edit.c
-	intern/MOD_ocean.c
-	intern/MOD_particleinstance.c
-	intern/MOD_particlesystem.c
-	intern/MOD_remesh.c
-	intern/MOD_screw.c
-	intern/MOD_shapekey.c
-	intern/MOD_shrinkwrap.c
-	intern/MOD_simpledeform.c
-	intern/MOD_skin.c
-	intern/MOD_smoke.c
-	intern/MOD_smooth.c
-	intern/MOD_softbody.c
-	intern/MOD_solidify.c
-	intern/MOD_subsurf.c
-	intern/MOD_surface.c
-	intern/MOD_surfacedeform.c
-	intern/MOD_triangulate.c
-	intern/MOD_util.c
-	intern/MOD_uvproject.c
-	intern/MOD_uvwarp.c
-	intern/MOD_warp.c
-	intern/MOD_wave.c
-	intern/MOD_weighted_normal.c
-	intern/MOD_weightvg_util.c
-	intern/MOD_weightvgedit.c
-	intern/MOD_weightvgmix.c
-	intern/MOD_weightvgproximity.c
-	intern/MOD_wireframe.c
+  intern/MOD_armature.c
+  intern/MOD_array.c
+  intern/MOD_bevel.c
+  intern/MOD_boolean.c
+  intern/MOD_build.c
+  intern/MOD_cast.c
+  intern/MOD_cloth.c
+  intern/MOD_collision.c
+  intern/MOD_correctivesmooth.c
+  intern/MOD_curve.c
+  intern/MOD_datatransfer.c
+  intern/MOD_decimate.c
+  intern/MOD_displace.c
+  intern/MOD_dynamicpaint.c
+  intern/MOD_edgesplit.c
+  intern/MOD_explode.c
+  intern/MOD_fluidsim.c
+  intern/MOD_fluidsim_util.c
+  intern/MOD_functiondeform.c
+  intern/MOD_functionpoints.c
+  intern/MOD_hook.c
+  intern/MOD_laplaciandeform.c
+  intern/MOD_laplaciansmooth.c
+  intern/MOD_lattice.c
+  intern/MOD_mask.c
+  intern/MOD_meshcache.c
+  intern/MOD_meshcache_mdd.c
+  intern/MOD_meshcache_pc2.c
+  intern/MOD_meshcache_util.c
+  intern/MOD_meshdeform.c
+  intern/MOD_meshsequencecache.c
+  intern/MOD_mirror.c
+  intern/MOD_multires.c
+  intern/MOD_none.c
+  intern/MOD_normal_edit.c
+  intern/MOD_ocean.c
+  intern/MOD_particleinstance.c
+  intern/MOD_particlesystem.c
+  intern/MOD_remesh.c
+  intern/MOD_screw.c
+  intern/MOD_shapekey.c
+  intern/MOD_shrinkwrap.c
+  intern/MOD_simpledeform.c
+  intern/MOD_skin.c
+  intern/MOD_smoke.c
+  intern/MOD_smooth.c
+  intern/MOD_softbody.c
+  intern/MOD_solidify.c
+  intern/MOD_subsurf.c
+  intern/MOD_surface.c
+  intern/MOD_surfacedeform.c
+  intern/MOD_triangulate.c
+  intern/MOD_util.c
+  intern/MOD_uvproject.c
+  intern/MOD_uvwarp.c
+  intern/MOD_warp.c
+  intern/MOD_wave.c
+  intern/MOD_weighted_normal.c
+  intern/MOD_weightvg_util.c
+  intern/MOD_weightvgedit.c
+  intern/MOD_weightvgmix.c
+  intern/MOD_weightvgproximity.c
+  intern/MOD_wireframe.c
 
-	MOD_modifiertypes.h
-	intern/MOD_fluidsim_util.h
-	intern/MOD_meshcache_util.h
-	intern/MOD_util.h
-	intern/MOD_weightvg_util.h
+  MOD_modifiertypes.h
+  intern/MOD_fluidsim_util.h
+  intern/MOD_meshcache_util.h
+  intern/MOD_util.h
+  intern/MOD_weightvg_util.h
 )
 
 set(LIB
-	bf_blenkernel
-	bf_blenlib
+  bf_blenkernel
+  bf_blenlib
 )
 
 if(WITH_ALEMBIC)
-	add_definitions(-DWITH_ALEMBIC)
-	list(APPEND INC
-		../alembic
-	)
-	list(APPEND LIB
-		bf_alembic
-	)
+  add_definitions(-DWITH_ALEMBIC)
+  list(APPEND INC
+    ../alembic
+  )
+  list(APPEND LIB
+    bf_alembic
+  )
 endif()
 
 if(WITH_MOD_REMESH)
-	list(APPEND INC
-		../../../intern/dualcon
-	)
-	list(APPEND LIB
-		bf_intern_dualcon
-	)
-	add_definitions(-DWITH_MOD_REMESH)
+  list(APPEND INC
+    ../../../intern/dualcon
+  )
+  list(APPEND LIB
+    bf_intern_dualcon
+  )
+  add_definitions(-DWITH_MOD_REMESH)
 endif()
 
 if(WITH_MOD_FLUID)
-	add_definitions(-DWITH_MOD_FLUID)
+  add_definitions(-DWITH_MOD_FLUID)
 endif()
 
 if(WITH_MOD_OCEANSIM)
-	add_definitions(-DWITH_OCEANSIM)
+  add_definitions(-DWITH_OCEANSIM)
 endif()
 
 if(WITH_BULLET)
-	list(APPEND LIB
-		extern_bullet
-	)
-	add_definitions(-DWITH_BULLET)
+  list(APPEND LIB
+    extern_bullet
+  )
+  add_definitions(-DWITH_BULLET)
 endif()
 
 if(WITH_INTERNATIONAL)
-	add_definitions(-DWITH_INTERNATIONAL)
+  add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
 # So we can have special tricks in modifier system.