[Bf-blender-cvs] [05281ab] strand_gpu: Merge branch 'master' into mesh_samples

[Lukas Tönne]

Commit: 05281abca14ed347878e168a37ea0665798a528b
Author: Lukas Tönne
Date:   Fri Aug 21 15:07:47 2015 +0200
Branches: strand_gpu
https://developer.blender.org/rB05281abca14ed347878e168a37ea0665798a528b

Merge branch 'master' into mesh_samples

Conflicts:
	release/datafiles/locale
	release/scripts/addons
	source/blender/blenkernel/CMakeLists.txt

===================================================================



===================================================================

diff --cc source/blender/blenkernel/CMakeLists.txt
index 0c606ae,0865efb..557e9a0
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -121,7 -130,7 +130,8 @@@ set(SR
  	intern/mesh.c
  	intern/mesh_evaluate.c
  	intern/mesh_mapping.c
+ 	intern/mesh_remap.c
 +	intern/mesh_sample.c
  	intern/mesh_validate.c
  	intern/modifier.c
  	intern/modifiers_bmesh.c
@@@ -229,9 -244,10 +245,11 @@@
  	BKE_mask.h
  	BKE_material.h
  	BKE_mball.h
+ 	BKE_mball_tessellate.h
  	BKE_mesh.h
  	BKE_mesh_mapping.h
+ 	BKE_mesh_remap.h
 +	BKE_mesh_sample.h
  	BKE_modifier.h
  	BKE_movieclip.h
  	BKE_multires.h