Merging r58475 through r58700 from trunk into soc-2013-depsgraph_mt
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 29 Jul 2013 02:49:36 +0000 (02:49 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 29 Jul 2013 02:49:36 +0000 (02:49 +0000)
28 files changed:
1  2 
source/blender/blenkernel/BKE_curve.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/armature/armature_skinning.c
source/blender/editors/curve/curve_intern.h
source/blender/editors/curve/curve_ops.c
source/blender/editors/curve/editcurve.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modifier.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_iterators.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/util/crazyspace.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/windowmanager/intern/wm_event_system.c
source/creator/creator.c
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

Simple merge
index b11f88d5260147d089a8b720161d368829644ada,3422f783eeb017d14e25ab5050692cefcabc6ee8..5fd49542c2863d619716dfaa31dfb6dd3fa77d59
  #include "BLI_blenlib.h"
  #include "BLI_math.h"
  #include "BLI_memarena.h"
- #include "BLI_array.h"
  #include "BLI_utildefines.h"
  #include "BLI_linklist.h"
 +#include "BLI_threads.h"
  
  #include "BKE_pbvh.h"
  #include "BKE_cdderivedmesh.h"
Simple merge
Simple merge