Merging r38832 through r38897 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 1 Aug 2011 15:24:15 +0000 (15:24 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 1 Aug 2011 15:24:15 +0000 (15:24 +0000)
1  2 
CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_ID.c
source/blender/modifiers/intern/MOD_uvproject.c

diff --cc CMakeLists.txt
Simple merge
  #include "DNA_meshdata_types.h"
  #include "DNA_camera_types.h"
  #include "DNA_object_types.h"
 +#include "DNA_scene_types.h"
  
  #include "BLI_math.h"
+ #include "BLI_string.h"
  #include "BLI_uvproject.h"
  #include "BLI_utildefines.h"