Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-08-06 20:21:55 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-08-06 20:38:01 +0300
commit00cb31de6577f79adb26c08a3fdef7186e17e237 (patch)
tree29f44f5c8bc85215ea85f69df9e2866487f66ccc /source/blender/editors/space_image
parente2630f388d6f8c1eb8663300cf81244600c9ad39 (diff)
Cleanup: use BKE_ prefix for BKE_colortools.h
Diffstat (limited to 'source/blender/editors/space_image')
-rw-r--r--source/blender/editors/space_image/image_edit.c8
-rw-r--r--source/blender/editors/space_image/image_ops.c4
-rw-r--r--source/blender/editors/space_image/space_image.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index 829a78b2bfa..ccd0a2bfd79 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -385,10 +385,10 @@ void ED_space_image_scopes_update(const struct bContext *C,
}
}
- scopes_update(&sima->scopes,
- ibuf,
- use_view_settings ? &scene->view_settings : NULL,
- &scene->display_settings);
+ BKE_scopes_update(&sima->scopes,
+ ibuf,
+ use_view_settings ? &scene->view_settings : NULL,
+ &scene->display_settings);
}
bool ED_space_image_show_render(SpaceImage *sima)
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 374a58d1808..1aa8c4c988b 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -3217,10 +3217,10 @@ static void image_sample_apply(bContext *C, wmOperator *op, const wmEvent *event
int point = RNA_enum_get(op->ptr, "point");
if (point == 1) {
- curvemapping_set_black_white(curve_mapping, NULL, info->linearcol);
+ BKE_curvemapping_set_black_white(curve_mapping, NULL, info->linearcol);
}
else if (point == 0) {
- curvemapping_set_black_white(curve_mapping, info->linearcol, NULL);
+ BKE_curvemapping_set_black_white(curve_mapping, info->linearcol, NULL);
}
WM_event_add_notifier(C, NC_WINDOW, NULL);
}
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 7ff075bf819..17f808f727d 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -131,7 +131,7 @@ static SpaceLink *image_new(const ScrArea *UNUSED(area), const Scene *UNUSED(sce
BKE_imageuser_default(&simage->iuser);
simage->iuser.flag = IMA_SHOW_STEREO | IMA_ANIM_ALWAYS;
- scopes_new(&simage->scopes);
+ BKE_scopes_new(&simage->scopes);
simage->sample_line_hist.height = 100;
/* tool header */
@@ -179,7 +179,7 @@ static void image_free(SpaceLink *sl)
{
SpaceImage *simage = (SpaceImage *)sl;
- scopes_free(&simage->scopes);
+ BKE_scopes_free(&simage->scopes);
}
/* spacetype; init callback, add handlers */
@@ -197,7 +197,7 @@ static SpaceLink *image_duplicate(SpaceLink *sl)
/* clear or remove stuff from old */
- scopes_new(&simagen->scopes);
+ BKE_scopes_new(&simagen->scopes);
return (SpaceLink *)simagen;
}