Commit: 5843de3251464f77b68bc113efe6f0a6bfc9a1c9
Author: Philipp Oeser
Date: Mon Jun 11 09:34:04 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5843de3251464f77b68bc113efe6f0a6bfc9a1c9
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/editors/sculpt_paint/paint_image_proj.c
index 32355d41ada,a24599f813f..aa38df71ded
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@@ -81,11 -81,9 +81,12 @@@
#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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
