Merge branch 'master' into blender2.8
authorPhilipp Oeser <info@graphics-engineer.com>
Mon, 11 Jun 2018 07:34:04 +0000 (09:34 +0200)
committerPhilipp Oeser <info@graphics-engineer.com>
Mon, 11 Jun 2018 07:34:04 +0000 (09:34 +0200)
1  2 
source/blender/editors/sculpt_paint/paint_image_proj.c

  #include "BKE_scene.h"
  #include "BKE_texture.h"
  
 +#include "DEG_depsgraph.h"
 +#include "DEG_depsgraph_query.h"
 +
  #include "UI_interface.h"
  
+ #include "ED_object.h"
  #include "ED_mesh.h"
  #include "ED_node.h"
  #include "ED_paint.h"
@@@ -5661,9 -5681,10 +5662,9 @@@ static Image *proj_paint_image_create(w
  
  static bool proj_paint_add_slot(bContext *C, wmOperator *op)
  {
-       Object *ob = CTX_data_active_object(C);
+       Object *ob = ED_object_active_context(C);
        Scene *scene = CTX_data_scene(C);
        Material *ma;
 -      bool is_bi = BKE_scene_uses_blender_internal(scene) || BKE_scene_uses_blender_game(scene);
        Image *ima = NULL;
  
        if (!ob)