[Bf-blender-cvs] [8e9c7f7] gooseberry: Merge branch 'master' into gooseberry

Campbell Barton noreply at git.blender.org
Thu May 7 15:49:13 CEST 2015


Commit: 8e9c7f70c80cbe1a6a67c3f7c639b0939982b332
Author: Campbell Barton
Date:   Thu May 7 23:38:03 2015 +1000
Branches: gooseberry
https://developer.blender.org/rB8e9c7f70c80cbe1a6a67c3f7c639b0939982b332

Merge branch 'master' into gooseberry

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



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

diff --cc source/blender/blenkernel/intern/object.c
index 845f0d9,5b29187..21adc5d
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -99,9 -96,9 +99,10 @@@
  #include "BKE_editmesh.h"
  #include "BKE_mball.h"
  #include "BKE_modifier.h"
+ #include "BKE_multires.h"
  #include "BKE_node.h"
  #include "BKE_object.h"
 +#include "BKE_object_deform.h"
  #include "BKE_paint.h"
  #include "BKE_particle.h"
  #include "BKE_pointcache.h"




More information about the Bf-blender-cvs mailing list