diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2018-06-11 10:34:04 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2018-06-11 10:34:04 +0300 |
commit | 5843de3251464f77b68bc113efe6f0a6bfc9a1c9 (patch) | |
tree | c093e411187bbf052a7566049c8e747255459c5a /source/blender/editors/sculpt_paint/paint_image_proj.c | |
parent | 7c10ed7e7247d50c0132e0b39b074bd8910afc86 (diff) | |
parent | 474a145d78ff9870e24fe6a2969bce6375da0754 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image_proj.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 32355d41ada..aa38df71ded 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -86,6 +86,7 @@ #include "UI_interface.h" +#include "ED_object.h" #include "ED_mesh.h" #include "ED_node.h" #include "ED_paint.h" @@ -5661,7 +5662,7 @@ static Image *proj_paint_image_create(wmOperator *op, Main *bmain) 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; Image *ima = NULL; @@ -5726,7 +5727,7 @@ static int texture_paint_add_texture_paint_slot_invoke(bContext *C, wmOperator * { char imagename[MAX_ID_NAME - 2]; Main *bmain = CTX_data_main(C); - Object *ob = CTX_data_active_object(C); + Object *ob = ED_object_active_context(C); Material *ma = give_current_material(ob, ob->actcol); int type = RNA_enum_get(op->ptr, "type"); |