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:
Diffstat (limited to 'source/blender/editors/util/ed_util_imbuf.c')
-rw-r--r--source/blender/editors/util/ed_util_imbuf.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/util/ed_util_imbuf.c b/source/blender/editors/util/ed_util_imbuf.c
index a6eed5d54d1..b832d9a1d86 100644
--- a/source/blender/editors/util/ed_util_imbuf.c
+++ b/source/blender/editors/util/ed_util_imbuf.c
@@ -30,7 +30,6 @@
#include "BKE_image.h"
#include "BKE_main.h"
#include "BKE_screen.h"
-#include "BKE_sequencer.h"
#include "ED_image.h"
#include "ED_screen.h"
@@ -43,6 +42,8 @@
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"
+#include "SEQ_sequencer.h"
+
#include "UI_view2d.h"
#include "WM_api.h"
@@ -273,7 +274,7 @@ static void image_sample_apply(bContext *C, wmOperator *op, const wmEvent *event
}
}
- // XXX node curve integration ..
+ /* XXX node curve integration. */
#if 0
{
ScrArea *sa, *cur = curarea;
@@ -369,7 +370,7 @@ static void sequencer_sample_apply(bContext *C, wmOperator *op, const wmEvent *e
/* sequencer's image buffers are in non-linear space, need to make them linear */
copy_v4_v4(info->linearcol, info->colf);
- BKE_sequencer_pixel_from_sequencer_space_v4(scene, info->linearcol);
+ SEQ_render_pixel_from_sequencer_space_v4(scene, info->linearcol);
info->color_manage = true;
}
@@ -512,7 +513,7 @@ int ED_imbuf_sample_modal(bContext *C, wmOperator *op, const wmEvent *event)
{
switch (event->type) {
case LEFTMOUSE:
- case RIGHTMOUSE: // XXX hardcoded
+ case RIGHTMOUSE: /* XXX hardcoded */
if (event->val == KM_RELEASE) {
ED_imbuf_sample_exit(C, op);
return OPERATOR_CANCELLED;