[Bf-blender-cvs] [1e73c40] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: 1e73c400a7b300dbbec58cd7f33c2970652ad23c
Author: Antony Riakiotakis
Date:   Thu Jun 25 20:23:16 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB1e73c400a7b300dbbec58cd7f33c2970652ad23c

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/blenkernel/intern/cdderivedmesh.c
	source/blender/makesrna/intern/rna_nodetree.c

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



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

diff --cc source/blender/blenkernel/intern/cdderivedmesh.c
index 55f9240,649778c7..e29f95f
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@@ -392,7 -392,7 +392,8 @@@ static void cdDM_drawUVEdges(DerivedMes
  static void cdDM_drawEdges(DerivedMesh *dm, bool drawLooseEdges, bool drawAllEdges)
  {
  	CDDerivedMesh *cddm = (CDDerivedMesh *) dm;
+ 	GPUDrawObject *gdo;
 +
  	if (cddm->pbvh && cddm->pbvh_draw &&
  	    BKE_pbvh_type(cddm->pbvh) == PBVH_BMESH)
  	{
diff --cc source/blender/blenloader/intern/versioning_270.c
index fa32469,6ab655e..1d49539
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -51,9 -48,7 +50,8 @@@
  #include "DNA_particle_types.h"
  #include "DNA_linestyle_types.h"
  #include "DNA_actuator_types.h"
- #include "DNA_camera_types.h"
  #include "DNA_view3d_types.h"
 +#include "DNA_smoke_types.h"
  
  #include "DNA_genfile.h"
  
diff --cc source/blender/makesrna/intern/rna_key.c
index b462729,04cba83..641c9a5
--- a/source/blender/makesrna/intern/rna_key.c
+++ b/source/blender/makesrna/intern/rna_key.c
@@@ -48,12 -47,9 +48,11 @@@
  
  #include <stddef.h>
  
 +#include "DNA_cache_library_types.h"
  #include "DNA_object_types.h"
- #include "DNA_scene_types.h"
  
  #include "BKE_animsys.h"
 +#include "BKE_cache_library.h"
  #include "BKE_depsgraph.h"
  #include "BKE_key.h"
  #include "BKE_main.h"
diff --cc source/blender/makesrna/intern/rna_object.c
index 17c75da,3113b70..c248998
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@@ -205,10 -197,8 +202,9 @@@ EnumPropertyItem object_axis_unsigned_i
  #include "BKE_mesh.h"
  #include "BKE_particle.h"
  #include "BKE_scene.h"
 +#include "BKE_strands.h"
  #include "BKE_deform.h"
  
- #include "ED_mesh.h"
  #include "ED_object.h"
  #include "ED_particle.h"
  #include "ED_curve.h"