svn merge -r 15973:16060 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Tue, 12 Aug 2008 09:49:46 +0000 (09:49 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Tue, 12 Aug 2008 09:49:46 +0000 (09:49 +0000)
1  2 
config/linux2-config.py
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/particle_system.c
source/blender/src/buttons_editing.c

Simple merge
index 88a3c64cbf278dc98b97b6b72f817438efcea86c,1dc76296c28783d75d5164f5ca7280fc7fd6c0f6..8bc82a6731c490162976da606122b9877aa2984a
  #include "BKE_main.h"
  #include "BKE_anim.h"
  #include "BKE_bad_level_calls.h"
 +#include "BKE_bmesh.h"
 +#include "BKE_booleanops.h"
  #include "BKE_cloth.h"
  #include "BKE_collision.h"
 +#include "BKE_cdderivedmesh.h"
  #include "BKE_curve.h"
  #include "BKE_customdata.h"
 -#include "BKE_global.h"
 -#include "BKE_cdderivedmesh.h"
  #include "BKE_DerivedMesh.h"
 -#include "BKE_booleanops.h"
  #include "BKE_displist.h"
 -#include "BKE_modifier.h"
 +#include "BKE_fluidsim.h"
 +#include "BKE_global.h"
  #include "BKE_lattice.h"
  #include "BKE_library.h"
 -#include "BKE_subsurf.h"
 -#include "BKE_object.h"
 -#include "BKE_mesh.h"
 -#include "BKE_softbody.h"
 -#include "BKE_cloth.h"
  #include "BKE_material.h"
 +#include "BKE_mesh.h"
 +#include "BKE_modifier.h"
 +#include "BKE_object.h"
  #include "BKE_particle.h"
  #include "BKE_pointcache.h"
 +#include "BKE_softbody.h"
 +#include "BKE_subsurf.h"
+ #include "BKE_texture.h"
  #include "BKE_utildefines.h"
 +
  #include "depsgraph_private.h"
 -#include "BKE_bmesh.h"
  
  #include "LOD_DependKludge.h"
  #include "LOD_decimation.h"
Simple merge