diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-08-29 09:35:19 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-29 09:35:19 +0400 |
commit | 8a215669e8668b81610903a80a0c11e1cf64ccac (patch) | |
tree | 8f36c005b3d3327c46cea7240feb5a1437020fd4 /source/blender/editors/sculpt_paint | |
parent | 1dddad93c45bb29e001afe21e24ae1f34aaa3e7f (diff) |
Cleanup
Diffstat (limited to 'source/blender/editors/sculpt_paint')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index f0176bcd04d..0d65a28b802 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -1413,12 +1413,12 @@ void paint_proj_mesh_data_ensure(bContext *C, Object *ob, wmOperator *op) Material *ma = BKE_material_add(CTX_data_main(C), "Material"); /* no material found, just assign to first slot */ assign_material(ob, ma, i, BKE_MAT_ASSIGN_USERPREF); - proj_paint_add_slot(C, ma, NULL); + proj_paint_add_slot(C, ma, NULL); } } } } - else if (imapaint->mode == IMAGEPAINT_MODE_IMAGE){ + else if (imapaint->mode == IMAGEPAINT_MODE_IMAGE) { if (imapaint->canvas == NULL) { int width; int height; diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 3c6fb5dfe20..fbe0a6942e7 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -4518,9 +4518,9 @@ static void project_state_init(bContext *C, Object *ob, ProjPaintState *ps, int ps->do_material_slots = (settings->imapaint.mode == IMAGEPAINT_MODE_MATERIAL); ps->stencil_ima = settings->imapaint.stencil; ps->canvas_ima = (!ps->do_material_slots) ? - settings->imapaint.canvas : NULL; + settings->imapaint.canvas : NULL; ps->clone_ima = (!ps->do_material_slots) ? - settings->imapaint.clone : NULL; + settings->imapaint.clone : NULL; /* setup projection painting data */ ps->do_backfacecull = (settings->imapaint.flag & IMAGEPAINT_PROJECT_BACKFACE) ? 0 : 1; |