blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Philipp Oeser 2018-06-11 09:34:04 +02:00
parent 7c10ed7e72 474a145d78
commit 5843de3251
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@ -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");