[Bf-blender-cvs] [804a2b2] depsgraph_refactor: Merge branch 'master' into depsgraph_refactor

Sergey Sharybin noreply at git.blender.org
Mon Feb 23 14:15:52 CET 2015


Commit: 804a2b27f335e3b7f1fd56b66c97f5a84f26e22b
Author: Sergey Sharybin
Date:   Mon Feb 23 18:02:07 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB804a2b27f335e3b7f1fd56b66c97f5a84f26e22b

Merge branch 'master' into depsgraph_refactor

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



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

diff --cc source/blender/editors/object/object_edit.c
index 577561d,458feeb..020ab15
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@@ -65,8 -65,8 +65,9 @@@
  #include "BKE_curve.h"
  #include "BKE_effect.h"
  #include "BKE_depsgraph.h"
 +#include "BKE_global.h"
  #include "BKE_image.h"
+ #include "BKE_lattice.h"
  #include "BKE_library.h"
  #include "BKE_main.h"
  #include "BKE_material.h"




More information about the Bf-blender-cvs mailing list