diff options
author | Bastien Montagne <bastien@blender.org> | 2020-09-21 15:43:29 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-09-21 15:43:29 +0300 |
commit | 87d2ac96812fd30bcfcef34a8b78b9df8a72982e (patch) | |
tree | c08ce36779dac293f481b60ac20a6569d99b691a /source/blender/editors/sculpt_paint/paint_image.c | |
parent | 82aa300e1ce47f2b77e868ba43ffeaff0dc7bf96 (diff) |
Cleanup: move some paint helpers to ED_ 'namespace'.
Those two functions had `BKE_` prefix, were defined in BKE headers, but
implemented in ED code, yuck.
Moved everything to ED area for now, since those do not look fondamental
enough to belong to BKE, and none of their usages requires it currently.
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_image.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 5bfb03ee42f..3ac2b65f97a 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -493,8 +493,8 @@ static PaintOperation *texture_paint_init(bContext *C, wmOperator *op, const flo ViewLayer *view_layer = CTX_data_view_layer(C); Object *ob = OBACT(view_layer); bool uvs, mat, tex, stencil; - if (!BKE_paint_proj_mesh_data_check(scene, ob, &uvs, &mat, &tex, &stencil)) { - BKE_paint_data_warning(op->reports, uvs, mat, tex, stencil); + if (!ED_paint_proj_mesh_data_check(scene, ob, &uvs, &mat, &tex, &stencil)) { + ED_paint_data_warning(op->reports, uvs, mat, tex, stencil); MEM_freeN(pop); WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, NULL); return NULL; @@ -1127,7 +1127,7 @@ void ED_object_texture_paint_mode_enter_ex(Main *bmain, Scene *scene, Object *ob * cache in case we are loading a file */ BKE_texpaint_slots_refresh_object(scene, ob); - BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL); + ED_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL); /* entering paint mode also sets image to editors */ if (imapaint->mode == IMAGEPAINT_MODE_MATERIAL) { |