Merge branch 'master' into 28
authorCampbell Barton <ideasman42@gmail.com>
Wed, 26 Apr 2017 14:58:28 +0000 (00:58 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 26 Apr 2017 14:58:28 +0000 (00:58 +1000)
1  2 
source/blender/blenkernel/intern/object.c
source/blender/editors/render/render_opengl.c

index fea292c1350d78f1e715a3b820b60f3ebc065e8a,fbca03c1e0724d43eea3d685fe1e3d6b0cb9b633..b70eb2b503a74e29fd84059c60bebd0e00393fb3
  #endif
  
  #include "CCGSubSurf.h"
+ #include "atomic_ops.h"
  
 -#include "GPU_material.h"
 +#include "GPU_lamp.h"
  
  /* Vertex parent modifies original BMesh which is not safe for threading.
   * Ideally such a modification should be handled as a separate DAG update