svn merge -r36564:36583 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 10 May 2011 00:45:06 +0000 (00:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 10 May 2011 00:45:06 +0000 (00:45 +0000)
1  2 
intern/ghost/intern/GHOST_SystemX11.cpp
source/blender/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/displist.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_object.c
source/creator/CMakeLists.txt

Simple merge
index 7b0bb2dcf7a9692d0afadbcf2e857f124774c3a3,ba30aecc9ab8bce1aae0684b3bd4a5b9a5f6da01..12296bb10b0a7782f10942bc8b00300adb968464
@@@ -46,8 -46,8 +46,9 @@@
  #include "DNA_scene_types.h"
  #include "DNA_smoke_types.h"
  #include "DNA_world_types.h"
+ #include "DNA_armature_types.h"
  
 +#include "BLI_utildefines.h"
  #include "BLI_blenlib.h"
  #include "BLI_math.h"
  #include "BLI_editVert.h"
  #include "BKE_pointcache.h"
  #include "BKE_unit.h"
  
 +#include "BKE_tessmesh.h"
 +
  #include "smoke_API.h"
  
+ #include "IMB_imbuf.h"
+ #include "IMB_imbuf_types.h"
  #include "BIF_gl.h"
  #include "BIF_glutil.h"
  
Simple merge