diff options
Diffstat (limited to 'source/blender/editors/space_image')
-rw-r--r-- | source/blender/editors/space_image/image_buttons.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 19 | ||||
-rw-r--r-- | source/blender/editors/space_image/space_image.c | 10 |
3 files changed, 22 insertions, 10 deletions
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 26162266441..0cf304d8f7a 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -181,7 +181,8 @@ void image_preview_event(int event) BIF_store_spare(); - ntreeCompositExecTree(scene->nodetree, &scene->r, 1, &scene->view_settings, &scene->display_settings); /* 1 is do_previews */ + /* 1 is do_previews */ + ntreeCompositExecTree(scene->nodetree, &scene->r, 1, &scene->view_settings, &scene->display_settings); G.scene->nodetree->timecursor = NULL; G.scene->nodetree->test_break = NULL; diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 87d2f439ad7..9db5237fdef 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1511,7 +1511,8 @@ void IMAGE_OT_match_movie_length(wmOperatorType *ot) ot->exec = image_match_len_exec; /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_INTERNAL/* | OPTYPE_UNDO */; /* Don't think we need undo for that. */ + /* Don't think we need undo for that. */ + ot->flag = OPTYPE_REGISTER | OPTYPE_INTERNAL/* | OPTYPE_UNDO */; } /******************** replace image operator ********************/ @@ -1640,7 +1641,8 @@ static int save_image_options_init(Main *bmain, SaveImageOptions *simopts, Space simopts->im_format = scene->r.im_format; is_depth_set = true; if (!BKE_image_is_multiview(ima)) { - /* In case multiview is disabled, render settings would be invalid for render result in this area. */ + /* In case multiview is disabled, + * render settings would be invalid for render result in this area. */ simopts->im_format.stereo3d_format = *ima->stereo3d_format; simopts->im_format.views_format = ima->views_format; } @@ -1660,7 +1662,8 @@ static int save_image_options_init(Main *bmain, SaveImageOptions *simopts, Space simopts->im_format.views_format = ima->views_format; } - //simopts->subimtype = scene->r.subimtype; /* XXX - this is lame, we need to make these available too! */ + ///* XXX - this is lame, we need to make these available too! */ + //simopts->subimtype = scene->r.subimtype; BLI_strncpy(simopts->filepath, ibuf->name, sizeof(simopts->filepath)); @@ -2607,13 +2610,16 @@ static int image_invert_exec(bContext *C, wmOperator *op) size_t i; - if (ibuf == NULL) /* TODO: this should actually never happen, but does for render-results -> cleanup */ + if (ibuf == NULL) { + /* TODO: this should actually never happen, but does for render-results -> cleanup */ return OPERATOR_CANCELLED; + } if (support_undo) { ED_image_undo_push_begin(op->type->name); /* not strictly needed, because we only imapaint_dirty_region to invalidate all tiles - * but better do this right in case someone copies this for a tool that uses partial redraw better */ + * but better do this right in case someone copies this for a tool that uses partial + * redraw better */ ED_imapaint_clear_partial_redraw(); ED_imapaint_dirty_region(ima, ibuf, 0, 0, ibuf->x, ibuf->y, false); } @@ -2863,7 +2869,8 @@ void IMAGE_OT_unpack(wmOperatorType *ot) /* properties */ RNA_def_enum(ot->srna, "method", rna_enum_unpack_method_items, PF_USE_LOCAL, "Method", "How to unpack"); - RNA_def_string(ot->srna, "id", NULL, MAX_ID_NAME - 2, "Image Name", "Image data-block name to unpack"); /* XXX, weark!, will fail with library, name collisions */ + /* XXX, weak!, will fail with library, name collisions */ + RNA_def_string(ot->srna, "id", NULL, MAX_ID_NAME - 2, "Image Name", "Image data-block name to unpack"); } /******************** sample image operator ********************/ diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 4f2b0f0db2b..1025a924f9e 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -308,9 +308,12 @@ static void image_keymap(struct wmKeyConfig *keyconf) /* dropboxes */ static bool image_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event), const char **UNUSED(tooltip)) { - if (drag->type == WM_DRAG_PATH) - if (ELEM(drag->icon, 0, ICON_FILE_IMAGE, ICON_FILE_MOVIE, ICON_FILE_BLANK)) /* rule might not work? */ + if (drag->type == WM_DRAG_PATH) { + /* rule might not work? */ + if (ELEM(drag->icon, 0, ICON_FILE_IMAGE, ICON_FILE_MOVIE, ICON_FILE_BLANK)) { return 1; + } + } return 0; } @@ -403,7 +406,8 @@ static void image_listener(wmWindow *win, ScrArea *sa, wmNotifier *wmn, Scene *U case NC_MASK: { // Scene *scene = wmn->window->screen->scene; - /* ideally would check for: ED_space_image_check_show_maskedit(scene, sima) but we cant get the scene */ + /* ideally would check for: ED_space_image_check_show_maskedit(scene, sima) + * but we cant get the scene */ if (sima->mode == SI_MODE_MASK) { switch (wmn->data) { case ND_SELECT: |