diff options
Diffstat (limited to 'source/blender/editors/space_image/space_image.c')
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 1559 |
1 files changed, 783 insertions, 776 deletions
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index d5eb0b485a1..e1875fd6129 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -64,7 +64,6 @@ #include "ED_uvedit.h" #include "ED_transform.h" - #include "WM_api.h" #include "WM_types.h" #include "WM_message.h" @@ -86,254 +85,255 @@ static void image_scopes_tag_refresh(ScrArea *sa) { - SpaceImage *sima = (SpaceImage *)sa->spacedata.first; - ARegion *ar; + SpaceImage *sima = (SpaceImage *)sa->spacedata.first; + ARegion *ar; - /* only while histogram is visible */ - for (ar = sa->regionbase.first; ar; ar = ar->next) { - if (ar->regiontype == RGN_TYPE_TOOL_PROPS && ar->flag & RGN_FLAG_HIDDEN) { - return; - } - } + /* only while histogram is visible */ + for (ar = sa->regionbase.first; ar; ar = ar->next) { + if (ar->regiontype == RGN_TYPE_TOOL_PROPS && ar->flag & RGN_FLAG_HIDDEN) { + return; + } + } - sima->scopes.ok = 0; + sima->scopes.ok = 0; } static void image_user_refresh_scene(const bContext *C, SpaceImage *sima) { - /* Update scene image user for acquiring render results. */ - sima->iuser.scene = CTX_data_scene(C); - - if (sima->image && sima->image->type == IMA_TYPE_R_RESULT) { - /* While rendering, prefer scene that is being rendered. */ - Scene *render_scene = ED_render_job_get_current_scene(C); - if (render_scene) { - sima->iuser.scene = render_scene; - } - } - - /* Auto switch image to show in UV editor when selection changes. */ - ED_space_image_auto_set(C, sima); + /* Update scene image user for acquiring render results. */ + sima->iuser.scene = CTX_data_scene(C); + + if (sima->image && sima->image->type == IMA_TYPE_R_RESULT) { + /* While rendering, prefer scene that is being rendered. */ + Scene *render_scene = ED_render_job_get_current_scene(C); + if (render_scene) { + sima->iuser.scene = render_scene; + } + } + + /* Auto switch image to show in UV editor when selection changes. */ + ED_space_image_auto_set(C, sima); } /* ******************** manage regions ********************* */ ARegion *image_has_buttons_region(ScrArea *sa) { - ARegion *ar, *arnew; + ARegion *ar, *arnew; - ar = BKE_area_find_region_type(sa, RGN_TYPE_UI); - if (ar) { - return ar; - } + ar = BKE_area_find_region_type(sa, RGN_TYPE_UI); + if (ar) { + return ar; + } - /* add subdiv level; after header */ - ar = BKE_area_find_region_type(sa, RGN_TYPE_HEADER); + /* add subdiv level; after header */ + ar = BKE_area_find_region_type(sa, RGN_TYPE_HEADER); - /* is error! */ - if (ar == NULL) { - return NULL; - } + /* is error! */ + if (ar == NULL) { + return NULL; + } - arnew = MEM_callocN(sizeof(ARegion), "buttons for image"); + arnew = MEM_callocN(sizeof(ARegion), "buttons for image"); - BLI_insertlinkafter(&sa->regionbase, ar, arnew); - arnew->regiontype = RGN_TYPE_UI; - arnew->alignment = RGN_ALIGN_RIGHT; + BLI_insertlinkafter(&sa->regionbase, ar, arnew); + arnew->regiontype = RGN_TYPE_UI; + arnew->alignment = RGN_ALIGN_RIGHT; - arnew->flag = RGN_FLAG_HIDDEN; + arnew->flag = RGN_FLAG_HIDDEN; - return arnew; + return arnew; } ARegion *image_has_tools_region(ScrArea *sa) { - ARegion *ar, *arnew; + ARegion *ar, *arnew; - ar = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS); - if (ar) { - return ar; - } + ar = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS); + if (ar) { + return ar; + } - /* add subdiv level; after buttons */ - ar = BKE_area_find_region_type(sa, RGN_TYPE_UI); + /* add subdiv level; after buttons */ + ar = BKE_area_find_region_type(sa, RGN_TYPE_UI); - /* is error! */ - if (ar == NULL) { - return NULL; - } + /* is error! */ + if (ar == NULL) { + return NULL; + } - arnew = MEM_callocN(sizeof(ARegion), "scopes for image"); + arnew = MEM_callocN(sizeof(ARegion), "scopes for image"); - BLI_insertlinkafter(&sa->regionbase, ar, arnew); - arnew->regiontype = RGN_TYPE_TOOLS; - arnew->alignment = RGN_ALIGN_LEFT; + BLI_insertlinkafter(&sa->regionbase, ar, arnew); + arnew->regiontype = RGN_TYPE_TOOLS; + arnew->alignment = RGN_ALIGN_LEFT; - arnew->flag = RGN_FLAG_HIDDEN; + arnew->flag = RGN_FLAG_HIDDEN; - image_scopes_tag_refresh(sa); + image_scopes_tag_refresh(sa); - return arnew; + return arnew; } /* ******************** default callbacks for image space ***************** */ static SpaceLink *image_new(const ScrArea *UNUSED(area), const Scene *UNUSED(scene)) { - ARegion *ar; - SpaceImage *simage; + ARegion *ar; + SpaceImage *simage; - simage = MEM_callocN(sizeof(SpaceImage), "initimage"); - simage->spacetype = SPACE_IMAGE; - simage->zoom = 1.0f; - simage->lock = true; - simage->flag = SI_SHOW_GPENCIL | SI_USE_ALPHA | SI_COORDFLOATS; + simage = MEM_callocN(sizeof(SpaceImage), "initimage"); + simage->spacetype = SPACE_IMAGE; + simage->zoom = 1.0f; + simage->lock = true; + simage->flag = SI_SHOW_GPENCIL | SI_USE_ALPHA | SI_COORDFLOATS; - simage->iuser.ok = true; - simage->iuser.frames = 100; - simage->iuser.flag = IMA_SHOW_STEREO | IMA_ANIM_ALWAYS; + simage->iuser.ok = true; + simage->iuser.frames = 100; + simage->iuser.flag = IMA_SHOW_STEREO | IMA_ANIM_ALWAYS; - scopes_new(&simage->scopes); - simage->sample_line_hist.height = 100; + scopes_new(&simage->scopes); + simage->sample_line_hist.height = 100; - /* header */ - ar = MEM_callocN(sizeof(ARegion), "header for image"); + /* header */ + ar = MEM_callocN(sizeof(ARegion), "header for image"); - BLI_addtail(&simage->regionbase, ar); - ar->regiontype = RGN_TYPE_HEADER; - ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP; + BLI_addtail(&simage->regionbase, ar); + ar->regiontype = RGN_TYPE_HEADER; + ar->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP; - /* buttons/list view */ - ar = MEM_callocN(sizeof(ARegion), "buttons for image"); + /* buttons/list view */ + ar = MEM_callocN(sizeof(ARegion), "buttons for image"); - BLI_addtail(&simage->regionbase, ar); - ar->regiontype = RGN_TYPE_UI; - ar->alignment = RGN_ALIGN_RIGHT; - ar->flag = RGN_FLAG_HIDDEN; + BLI_addtail(&simage->regionbase, ar); + ar->regiontype = RGN_TYPE_UI; + ar->alignment = RGN_ALIGN_RIGHT; + ar->flag = RGN_FLAG_HIDDEN; - /* scopes/uv sculpt/paint */ - ar = MEM_callocN(sizeof(ARegion), "buttons for image"); + /* scopes/uv sculpt/paint */ + ar = MEM_callocN(sizeof(ARegion), "buttons for image"); - BLI_addtail(&simage->regionbase, ar); - ar->regiontype = RGN_TYPE_TOOLS; - ar->alignment = RGN_ALIGN_LEFT; - ar->flag = RGN_FLAG_HIDDEN; + BLI_addtail(&simage->regionbase, ar); + ar->regiontype = RGN_TYPE_TOOLS; + ar->alignment = RGN_ALIGN_LEFT; + ar->flag = RGN_FLAG_HIDDEN; - /* main area */ - ar = MEM_callocN(sizeof(ARegion), "main area for image"); + /* main area */ + ar = MEM_callocN(sizeof(ARegion), "main area for image"); - BLI_addtail(&simage->regionbase, ar); - ar->regiontype = RGN_TYPE_WINDOW; + BLI_addtail(&simage->regionbase, ar); + ar->regiontype = RGN_TYPE_WINDOW; - return (SpaceLink *)simage; + return (SpaceLink *)simage; } /* not spacelink itself */ static void image_free(SpaceLink *sl) { - SpaceImage *simage = (SpaceImage *) sl; + SpaceImage *simage = (SpaceImage *)sl; - scopes_free(&simage->scopes); + scopes_free(&simage->scopes); } - /* spacetype; init callback, add handlers */ static void image_init(struct wmWindowManager *UNUSED(wm), ScrArea *sa) { - ListBase *lb = WM_dropboxmap_find("Image", SPACE_IMAGE, 0); - - /* add drop boxes */ - WM_event_add_dropbox_handler(&sa->handlers, lb); + ListBase *lb = WM_dropboxmap_find("Image", SPACE_IMAGE, 0); + /* add drop boxes */ + WM_event_add_dropbox_handler(&sa->handlers, lb); } static SpaceLink *image_duplicate(SpaceLink *sl) { - SpaceImage *simagen = MEM_dupallocN(sl); + SpaceImage *simagen = MEM_dupallocN(sl); - /* clear or remove stuff from old */ + /* clear or remove stuff from old */ - scopes_new(&simagen->scopes); + scopes_new(&simagen->scopes); - return (SpaceLink *)simagen; + return (SpaceLink *)simagen; } static void image_operatortypes(void) { - WM_operatortype_append(IMAGE_OT_view_all); - WM_operatortype_append(IMAGE_OT_view_pan); - WM_operatortype_append(IMAGE_OT_view_selected); - WM_operatortype_append(IMAGE_OT_view_zoom); - WM_operatortype_append(IMAGE_OT_view_zoom_in); - WM_operatortype_append(IMAGE_OT_view_zoom_out); - WM_operatortype_append(IMAGE_OT_view_zoom_ratio); - WM_operatortype_append(IMAGE_OT_view_zoom_border); + WM_operatortype_append(IMAGE_OT_view_all); + WM_operatortype_append(IMAGE_OT_view_pan); + WM_operatortype_append(IMAGE_OT_view_selected); + WM_operatortype_append(IMAGE_OT_view_zoom); + WM_operatortype_append(IMAGE_OT_view_zoom_in); + WM_operatortype_append(IMAGE_OT_view_zoom_out); + WM_operatortype_append(IMAGE_OT_view_zoom_ratio); + WM_operatortype_append(IMAGE_OT_view_zoom_border); #ifdef WITH_INPUT_NDOF - WM_operatortype_append(IMAGE_OT_view_ndof); + WM_operatortype_append(IMAGE_OT_view_ndof); #endif - WM_operatortype_append(IMAGE_OT_new); - WM_operatortype_append(IMAGE_OT_open); - WM_operatortype_append(IMAGE_OT_match_movie_length); - WM_operatortype_append(IMAGE_OT_replace); - WM_operatortype_append(IMAGE_OT_reload); - WM_operatortype_append(IMAGE_OT_save); - WM_operatortype_append(IMAGE_OT_save_as); - WM_operatortype_append(IMAGE_OT_save_sequence); - WM_operatortype_append(IMAGE_OT_pack); - WM_operatortype_append(IMAGE_OT_unpack); + WM_operatortype_append(IMAGE_OT_new); + WM_operatortype_append(IMAGE_OT_open); + WM_operatortype_append(IMAGE_OT_match_movie_length); + WM_operatortype_append(IMAGE_OT_replace); + WM_operatortype_append(IMAGE_OT_reload); + WM_operatortype_append(IMAGE_OT_save); + WM_operatortype_append(IMAGE_OT_save_as); + WM_operatortype_append(IMAGE_OT_save_sequence); + WM_operatortype_append(IMAGE_OT_pack); + WM_operatortype_append(IMAGE_OT_unpack); - WM_operatortype_append(IMAGE_OT_invert); + WM_operatortype_append(IMAGE_OT_invert); - WM_operatortype_append(IMAGE_OT_cycle_render_slot); - WM_operatortype_append(IMAGE_OT_clear_render_slot); - WM_operatortype_append(IMAGE_OT_add_render_slot); - WM_operatortype_append(IMAGE_OT_remove_render_slot); + WM_operatortype_append(IMAGE_OT_cycle_render_slot); + WM_operatortype_append(IMAGE_OT_clear_render_slot); + WM_operatortype_append(IMAGE_OT_add_render_slot); + WM_operatortype_append(IMAGE_OT_remove_render_slot); - WM_operatortype_append(IMAGE_OT_sample); - WM_operatortype_append(IMAGE_OT_sample_line); - WM_operatortype_append(IMAGE_OT_curves_point_set); + WM_operatortype_append(IMAGE_OT_sample); + WM_operatortype_append(IMAGE_OT_sample_line); + WM_operatortype_append(IMAGE_OT_curves_point_set); - WM_operatortype_append(IMAGE_OT_properties); - WM_operatortype_append(IMAGE_OT_toolshelf); + WM_operatortype_append(IMAGE_OT_properties); + WM_operatortype_append(IMAGE_OT_toolshelf); - WM_operatortype_append(IMAGE_OT_change_frame); + WM_operatortype_append(IMAGE_OT_change_frame); - WM_operatortype_append(IMAGE_OT_read_viewlayers); - WM_operatortype_append(IMAGE_OT_render_border); - WM_operatortype_append(IMAGE_OT_clear_render_border); + WM_operatortype_append(IMAGE_OT_read_viewlayers); + WM_operatortype_append(IMAGE_OT_render_border); + WM_operatortype_append(IMAGE_OT_clear_render_border); } static void image_keymap(struct wmKeyConfig *keyconf) { - WM_keymap_ensure(keyconf, "Image Generic", SPACE_IMAGE, 0); - WM_keymap_ensure(keyconf, "Image", SPACE_IMAGE, 0); + WM_keymap_ensure(keyconf, "Image Generic", SPACE_IMAGE, 0); + WM_keymap_ensure(keyconf, "Image", SPACE_IMAGE, 0); } /* dropboxes */ -static bool image_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event), const char **UNUSED(tooltip)) +static bool image_drop_poll(bContext *UNUSED(C), + wmDrag *drag, + const wmEvent *UNUSED(event), + const char **UNUSED(tooltip)) { - 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; + 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; } static void image_drop_copy(wmDrag *drag, wmDropBox *drop) { - /* copy drag path to properties */ - RNA_string_set(drop->ptr, "filepath", drag->path); + /* copy drag path to properties */ + RNA_string_set(drop->ptr, "filepath", drag->path); } /* area+region dropbox definition */ static void image_dropboxes(void) { - ListBase *lb = WM_dropboxmap_find("Image", SPACE_IMAGE, 0); + ListBase *lb = WM_dropboxmap_find("Image", SPACE_IMAGE, 0); - WM_dropbox_add(lb, "IMAGE_OT_open", image_drop_poll, image_drop_copy); + WM_dropbox_add(lb, "IMAGE_OT_open", image_drop_poll, image_drop_copy); } /** @@ -342,192 +342,187 @@ static void image_dropboxes(void) */ static void image_refresh(const bContext *C, ScrArea *sa) { - Scene *scene = CTX_data_scene(C); - SpaceImage *sima = sa->spacedata.first; - Image *ima; - - ima = ED_space_image(sima); - - BKE_image_user_frame_calc(&sima->iuser, scene->r.cfra); - - /* check if we have to set the image from the editmesh */ - if (ima && (ima->source == IMA_SRC_VIEWER && sima->mode == SI_MODE_MASK)) { - if (scene->nodetree) { - Mask *mask = ED_space_image_get_mask(sima); - if (mask) { - ED_node_composite_job(C, scene->nodetree, scene); - } - } - } + Scene *scene = CTX_data_scene(C); + SpaceImage *sima = sa->spacedata.first; + Image *ima; + + ima = ED_space_image(sima); + + BKE_image_user_frame_calc(&sima->iuser, scene->r.cfra); + + /* check if we have to set the image from the editmesh */ + if (ima && (ima->source == IMA_SRC_VIEWER && sima->mode == SI_MODE_MASK)) { + if (scene->nodetree) { + Mask *mask = ED_space_image_get_mask(sima); + if (mask) { + ED_node_composite_job(C, scene->nodetree, scene); + } + } + } } static void image_listener(wmWindow *win, ScrArea *sa, wmNotifier *wmn, Scene *UNUSED(scene)) { - SpaceImage *sima = (SpaceImage *)sa->spacedata.first; - - /* context changes */ - switch (wmn->category) { - case NC_WINDOW: - /* notifier comes from editing color space */ - image_scopes_tag_refresh(sa); - ED_area_tag_redraw(sa); - break; - case NC_SCENE: - switch (wmn->data) { - case ND_FRAME: - image_scopes_tag_refresh(sa); - ED_area_tag_refresh(sa); - ED_area_tag_redraw(sa); - break; - case ND_MODE: - if (wmn->subtype == NS_EDITMODE_MESH) { - ED_area_tag_refresh(sa); - } - ED_area_tag_redraw(sa); - break; - case ND_RENDER_RESULT: - case ND_RENDER_OPTIONS: - case ND_COMPO_RESULT: - if (ED_space_image_show_render(sima)) { - image_scopes_tag_refresh(sa); - } - ED_area_tag_redraw(sa); - break; - } - break; - case NC_IMAGE: - if (wmn->reference == sima->image || !wmn->reference) { - if (wmn->action != NA_PAINTING) { - image_scopes_tag_refresh(sa); - ED_area_tag_refresh(sa); - ED_area_tag_redraw(sa); - } - } - break; - case NC_SPACE: - if (wmn->data == ND_SPACE_IMAGE) { - image_scopes_tag_refresh(sa); - ED_area_tag_redraw(sa); - } - break; - 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 */ - if (sima->mode == SI_MODE_MASK) { - switch (wmn->data) { - case ND_SELECT: - ED_area_tag_redraw(sa); - break; - case ND_DATA: - case ND_DRAW: - /* causes node-recalc */ - ED_area_tag_redraw(sa); - ED_area_tag_refresh(sa); - break; - } - switch (wmn->action) { - case NA_SELECTED: - ED_area_tag_redraw(sa); - break; - case NA_EDITED: - /* causes node-recalc */ - ED_area_tag_redraw(sa); - ED_area_tag_refresh(sa); - break; - } - } - break; - } - case NC_GEOM: - { - switch (wmn->data) { - case ND_DATA: - case ND_SELECT: - image_scopes_tag_refresh(sa); - ED_area_tag_refresh(sa); - ED_area_tag_redraw(sa); - break; - } - break; - } - case NC_OBJECT: - { - switch (wmn->data) { - case ND_TRANSFORM: - case ND_MODIFIER: - { - ViewLayer *view_layer = WM_window_get_active_view_layer(win); - Object *ob = OBACT(view_layer); - if (ob && (ob == wmn->reference) && (ob->mode & OB_MODE_EDIT)) { - if (sima->lock && (sima->flag & SI_DRAWSHADOW)) { - ED_area_tag_refresh(sa); - ED_area_tag_redraw(sa); - } - } - break; - } - } - - break; - } - case NC_ID: - { - if (wmn->action == NA_RENAME) { - ED_area_tag_redraw(sa); - } - break; - } - case NC_WM: - if (wmn->data == ND_UNDO) { - ED_area_tag_redraw(sa); - ED_area_tag_refresh(sa); - } - break; - } + SpaceImage *sima = (SpaceImage *)sa->spacedata.first; + + /* context changes */ + switch (wmn->category) { + case NC_WINDOW: + /* notifier comes from editing color space */ + image_scopes_tag_refresh(sa); + ED_area_tag_redraw(sa); + break; + case NC_SCENE: + switch (wmn->data) { + case ND_FRAME: + image_scopes_tag_refresh(sa); + ED_area_tag_refresh(sa); + ED_area_tag_redraw(sa); + break; + case ND_MODE: + if (wmn->subtype == NS_EDITMODE_MESH) { + ED_area_tag_refresh(sa); + } + ED_area_tag_redraw(sa); + break; + case ND_RENDER_RESULT: + case ND_RENDER_OPTIONS: + case ND_COMPO_RESULT: + if (ED_space_image_show_render(sima)) { + image_scopes_tag_refresh(sa); + } + ED_area_tag_redraw(sa); + break; + } + break; + case NC_IMAGE: + if (wmn->reference == sima->image || !wmn->reference) { + if (wmn->action != NA_PAINTING) { + image_scopes_tag_refresh(sa); + ED_area_tag_refresh(sa); + ED_area_tag_redraw(sa); + } + } + break; + case NC_SPACE: + if (wmn->data == ND_SPACE_IMAGE) { + image_scopes_tag_refresh(sa); + ED_area_tag_redraw(sa); + } + break; + 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 */ + if (sima->mode == SI_MODE_MASK) { + switch (wmn->data) { + case ND_SELECT: + ED_area_tag_redraw(sa); + break; + case ND_DATA: + case ND_DRAW: + /* causes node-recalc */ + ED_area_tag_redraw(sa); + ED_area_tag_refresh(sa); + break; + } + switch (wmn->action) { + case NA_SELECTED: + ED_area_tag_redraw(sa); + break; + case NA_EDITED: + /* causes node-recalc */ + ED_area_tag_redraw(sa); + ED_area_tag_refresh(sa); + break; + } + } + break; + } + case NC_GEOM: { + switch (wmn->data) { + case ND_DATA: + case ND_SELECT: + image_scopes_tag_refresh(sa); + ED_area_tag_refresh(sa); + ED_area_tag_redraw(sa); + break; + } + break; + } + case NC_OBJECT: { + switch (wmn->data) { + case ND_TRANSFORM: + case ND_MODIFIER: { + ViewLayer *view_layer = WM_window_get_active_view_layer(win); + Object *ob = OBACT(view_layer); + if (ob && (ob == wmn->reference) && (ob->mode & OB_MODE_EDIT)) { + if (sima->lock && (sima->flag & SI_DRAWSHADOW)) { + ED_area_tag_refresh(sa); + ED_area_tag_redraw(sa); + } + } + break; + } + } + + break; + } + case NC_ID: { + if (wmn->action == NA_RENAME) { + ED_area_tag_redraw(sa); + } + break; + } + case NC_WM: + if (wmn->data == ND_UNDO) { + ED_area_tag_redraw(sa); + ED_area_tag_refresh(sa); + } + break; + } } const char *image_context_dir[] = {"edit_image", "edit_mask", NULL}; static int image_context(const bContext *C, const char *member, bContextDataResult *result) { - SpaceImage *sima = CTX_wm_space_image(C); - - if (CTX_data_dir(member)) { - CTX_data_dir_set(result, image_context_dir); - } - else if (CTX_data_equals(member, "edit_image")) { - CTX_data_id_pointer_set(result, (ID *)ED_space_image(sima)); - return 1; - } - else if (CTX_data_equals(member, "edit_mask")) { - Mask *mask = ED_space_image_get_mask(sima); - if (mask) { - CTX_data_id_pointer_set(result, &mask->id); - } - return true; - } - return 0; + SpaceImage *sima = CTX_wm_space_image(C); + + if (CTX_data_dir(member)) { + CTX_data_dir_set(result, image_context_dir); + } + else if (CTX_data_equals(member, "edit_image")) { + CTX_data_id_pointer_set(result, (ID *)ED_space_image(sima)); + return 1; + } + else if (CTX_data_equals(member, "edit_mask")) { + Mask *mask = ED_space_image_get_mask(sima); + if (mask) { + CTX_data_id_pointer_set(result, &mask->id); + } + return true; + } + return 0; } static void IMAGE_GGT_gizmo2d(wmGizmoGroupType *gzgt) { - gzgt->name = "UV Transform Gizmo"; - gzgt->idname = "IMAGE_GGT_gizmo2d"; + gzgt->name = "UV Transform Gizmo"; + gzgt->idname = "IMAGE_GGT_gizmo2d"; - gzgt->gzmap_params.spaceid = SPACE_IMAGE; - gzgt->gzmap_params.regionid = RGN_TYPE_WINDOW; + gzgt->gzmap_params.spaceid = SPACE_IMAGE; + gzgt->gzmap_params.regionid = RGN_TYPE_WINDOW; - gzgt->poll = ED_widgetgroup_gizmo2d_poll; - gzgt->setup = ED_widgetgroup_gizmo2d_setup; - gzgt->refresh = ED_widgetgroup_gizmo2d_refresh; - gzgt->draw_prepare = ED_widgetgroup_gizmo2d_draw_prepare; + gzgt->poll = ED_widgetgroup_gizmo2d_poll; + gzgt->setup = ED_widgetgroup_gizmo2d_setup; + gzgt->refresh = ED_widgetgroup_gizmo2d_refresh; + gzgt->draw_prepare = ED_widgetgroup_gizmo2d_draw_prepare; } static void image_widgets(void) { - WM_gizmogrouptype_append(IMAGE_GGT_gizmo2d); + WM_gizmogrouptype_append(IMAGE_GGT_gizmo2d); } /************************** main region ***************************/ @@ -535,261 +530,266 @@ static void image_widgets(void) /* sets up the fields of the View2D from zoom and offset */ static void image_main_region_set_view2d(SpaceImage *sima, ARegion *ar) { - Image *ima = ED_space_image(sima); + Image *ima = ED_space_image(sima); - int width, height; - ED_space_image_get_size(sima, &width, &height); + int width, height; + ED_space_image_get_size(sima, &width, &height); - float w = width; - float h = height; + float w = width; + float h = height; - if (ima) { - h *= ima->aspy / ima->aspx; - } + if (ima) { + h *= ima->aspy / ima->aspx; + } - int winx = BLI_rcti_size_x(&ar->winrct) + 1; - int winy = BLI_rcti_size_y(&ar->winrct) + 1; + int winx = BLI_rcti_size_x(&ar->winrct) + 1; + int winy = BLI_rcti_size_y(&ar->winrct) + 1; - /* For region overlap, move center so image doesn't overlap header. */ - rcti visible_rect; - ED_region_visible_rect(ar, &visible_rect); - const int visible_winy = BLI_rcti_size_y(&visible_rect) + 1; - int visible_centerx = 0; - int visible_centery = visible_rect.ymin + (visible_winy - winy) / 2; + /* For region overlap, move center so image doesn't overlap header. */ + rcti visible_rect; + ED_region_visible_rect(ar, &visible_rect); + const int visible_winy = BLI_rcti_size_y(&visible_rect) + 1; + int visible_centerx = 0; + int visible_centery = visible_rect.ymin + (visible_winy - winy) / 2; - ar->v2d.tot.xmin = 0; - ar->v2d.tot.ymin = 0; - ar->v2d.tot.xmax = w; - ar->v2d.tot.ymax = h; + ar->v2d.tot.xmin = 0; + ar->v2d.tot.ymin = 0; + ar->v2d.tot.xmax = w; + ar->v2d.tot.ymax = h; - ar->v2d.mask.xmin = ar->v2d.mask.ymin = 0; - ar->v2d.mask.xmax = winx; - ar->v2d.mask.ymax = winy; + ar->v2d.mask.xmin = ar->v2d.mask.ymin = 0; + ar->v2d.mask.xmax = winx; + ar->v2d.mask.ymax = winy; - /* which part of the image space do we see? */ - float x1 = ar->winrct.xmin + visible_centerx + (winx - sima->zoom * w) / 2.0f; - float y1 = ar->winrct.ymin + visible_centery + (winy - sima->zoom * h) / 2.0f; + /* which part of the image space do we see? */ + float x1 = ar->winrct.xmin + visible_centerx + (winx - sima->zoom * w) / 2.0f; + float y1 = ar->winrct.ymin + visible_centery + (winy - sima->zoom * h) / 2.0f; - x1 -= sima->zoom * sima->xof; - y1 -= sima->zoom * sima->yof; + x1 -= sima->zoom * sima->xof; + y1 -= sima->zoom * sima->yof; - /* relative display right */ - ar->v2d.cur.xmin = ((ar->winrct.xmin - (float)x1) / sima->zoom); - ar->v2d.cur.xmax = ar->v2d.cur.xmin + ((float)winx / sima->zoom); + /* relative display right */ + ar->v2d.cur.xmin = ((ar->winrct.xmin - (float)x1) / sima->zoom); + ar->v2d.cur.xmax = ar->v2d.cur.xmin + ((float)winx / sima->zoom); - /* relative display left */ - ar->v2d.cur.ymin = ((ar->winrct.ymin - (float)y1) / sima->zoom); - ar->v2d.cur.ymax = ar->v2d.cur.ymin + ((float)winy / sima->zoom); + /* relative display left */ + ar->v2d.cur.ymin = ((ar->winrct.ymin - (float)y1) / sima->zoom); + ar->v2d.cur.ymax = ar->v2d.cur.ymin + ((float)winy / sima->zoom); - /* normalize 0.0..1.0 */ - ar->v2d.cur.xmin /= w; - ar->v2d.cur.xmax /= w; - ar->v2d.cur.ymin /= h; - ar->v2d.cur.ymax /= h; + /* normalize 0.0..1.0 */ + ar->v2d.cur.xmin /= w; + ar->v2d.cur.xmax /= w; + ar->v2d.cur.ymin /= h; + ar->v2d.cur.ymax /= h; } /* add handlers, stuff you only do once or on area/region changes */ static void image_main_region_init(wmWindowManager *wm, ARegion *ar) { - wmKeyMap *keymap; + wmKeyMap *keymap; - // image space manages own v2d - // UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx, ar->winy); + // image space manages own v2d + // UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_STANDARD, ar->winx, ar->winy); - /* mask polls mode */ - keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", 0, 0); - WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); + /* mask polls mode */ + keymap = WM_keymap_ensure(wm->defaultconf, "Mask Editing", 0, 0); + WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); - /* image paint polls for mode */ - keymap = WM_keymap_ensure(wm->defaultconf, "Curve", 0, 0); - WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); + /* image paint polls for mode */ + keymap = WM_keymap_ensure(wm->defaultconf, "Curve", 0, 0); + WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); - keymap = WM_keymap_ensure(wm->defaultconf, "Paint Curve", 0, 0); - WM_event_add_keymap_handler(&ar->handlers, keymap); + keymap = WM_keymap_ensure(wm->defaultconf, "Paint Curve", 0, 0); + WM_event_add_keymap_handler(&ar->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Image Paint", 0, 0); - WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); + keymap = WM_keymap_ensure(wm->defaultconf, "Image Paint", 0, 0); + WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); - keymap = WM_keymap_ensure(wm->defaultconf, "UV Editor", 0, 0); - WM_event_add_keymap_handler(&ar->handlers, keymap); + keymap = WM_keymap_ensure(wm->defaultconf, "UV Editor", 0, 0); + WM_event_add_keymap_handler(&ar->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "UV Sculpt", 0, 0); - WM_event_add_keymap_handler(&ar->handlers, keymap); + keymap = WM_keymap_ensure(wm->defaultconf, "UV Sculpt", 0, 0); + WM_event_add_keymap_handler(&ar->handlers, keymap); - /* own keymaps */ - keymap = WM_keymap_ensure(wm->defaultconf, "Image Generic", SPACE_IMAGE, 0); - WM_event_add_keymap_handler(&ar->handlers, keymap); - keymap = WM_keymap_ensure(wm->defaultconf, "Image", SPACE_IMAGE, 0); - WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); + /* own keymaps */ + keymap = WM_keymap_ensure(wm->defaultconf, "Image Generic", SPACE_IMAGE, 0); + WM_event_add_keymap_handler(&ar->handlers, keymap); + keymap = WM_keymap_ensure(wm->defaultconf, "Image", SPACE_IMAGE, 0); + WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); } static void image_main_region_draw(const bContext *C, ARegion *ar) { - /* draw entirely, view changes should be handled here */ - SpaceImage *sima = CTX_wm_space_image(C); - Object *obact = CTX_data_active_object(C); - Object *obedit = CTX_data_edit_object(C); - Depsgraph *depsgraph = CTX_data_depsgraph(C); - Mask *mask = NULL; - bool curve = false; - Scene *scene = CTX_data_scene(C); - ViewLayer *view_layer = CTX_data_view_layer(C); - View2D *v2d = &ar->v2d; - //View2DScrollers *scrollers; - float col[3]; - - /* XXX This is in order to draw UI batches with the DRW - * olg context since we now use it for drawing the entire area */ - gpu_batch_presets_reset(); - - /* TODO(fclem) port to draw manager and remove the depth buffer allocation. */ - GPUViewport *viewport = ar->draw_buffer->viewport[ar->draw_buffer->stereo ? sima->iuser.multiview_eye : 0]; - DefaultFramebufferList *fbl = GPU_viewport_framebuffer_list_get(viewport); - GPU_framebuffer_bind(fbl->color_only_fb); - - /* XXX not supported yet, disabling for now */ - scene->r.scemode &= ~R_COMP_CROP; - - /* clear and setup matrix */ - UI_GetThemeColor3fv(TH_BACK, col); - GPU_clear_color(col[0], col[1], col[2], 0.0); - GPU_clear(GPU_COLOR_BIT); - - image_user_refresh_scene(C, sima); - - /* we set view2d from own zoom and offset each time */ - image_main_region_set_view2d(sima, ar); - - /* we draw image in pixelspace */ - draw_image_main(C, ar); - - /* and uvs in 0.0-1.0 space */ - UI_view2d_view_ortho(v2d); - - ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW); - - ED_uvedit_draw_main(sima, ar, scene, view_layer, obedit, obact, depsgraph); - - /* check for mask (delay draw) */ - if (ED_space_image_show_uvedit(sima, obedit)) { - /* pass */ - } - else if (sima->mode == SI_MODE_MASK) { - mask = ED_space_image_get_mask(sima); - } - else if (ED_space_image_paint_curve(C)) { - curve = true; - } - - ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW); - - if (sima->flag & SI_SHOW_GPENCIL) { - /* Grease Pencil too (in addition to UV's) */ - draw_image_grease_pencil((bContext *)C, true); - } - - /* sample line */ - draw_image_sample_line(sima); - - UI_view2d_view_restore(C); - - if (sima->flag & SI_SHOW_GPENCIL) { - /* draw Grease Pencil - screen space only */ - draw_image_grease_pencil((bContext *)C, false); - } - - if (mask) { - Image *image = ED_space_image(sima); - int width, height, show_viewer; - float aspx, aspy; - - show_viewer = (image && image->source == IMA_SRC_VIEWER); - - if (show_viewer) { - /* ED_space_image_get* will acquire image buffer which requires - * lock here by the same reason why lock is needed in draw_image_main - */ - BLI_thread_lock(LOCK_DRAW_IMAGE); - } - - ED_space_image_get_size(sima, &width, &height); - ED_space_image_get_aspect(sima, &aspx, &aspy); - - if (show_viewer) { - BLI_thread_unlock(LOCK_DRAW_IMAGE); - } - - ED_mask_draw_region(mask, ar, - sima->mask_info.draw_flag, - sima->mask_info.draw_type, - sima->mask_info.overlay_mode, - width, height, - aspx, aspy, - true, false, - NULL, C); - - UI_view2d_view_ortho(v2d); - ED_image_draw_cursor(ar, sima->cursor); - UI_view2d_view_restore(C); - } - else if (curve) { - UI_view2d_view_ortho(v2d); - ED_image_draw_cursor(ar, sima->cursor); - UI_view2d_view_restore(C); - } - - WM_gizmomap_draw(ar->gizmo_map, C, WM_GIZMOMAP_DRAWSTEP_2D); - - draw_image_cache(C, ar); - - /* scrollers? */ + /* draw entirely, view changes should be handled here */ + SpaceImage *sima = CTX_wm_space_image(C); + Object *obact = CTX_data_active_object(C); + Object *obedit = CTX_data_edit_object(C); + Depsgraph *depsgraph = CTX_data_depsgraph(C); + Mask *mask = NULL; + bool curve = false; + Scene *scene = CTX_data_scene(C); + ViewLayer *view_layer = CTX_data_view_layer(C); + View2D *v2d = &ar->v2d; + //View2DScrollers *scrollers; + float col[3]; + + /* XXX This is in order to draw UI batches with the DRW + * olg context since we now use it for drawing the entire area */ + gpu_batch_presets_reset(); + + /* TODO(fclem) port to draw manager and remove the depth buffer allocation. */ + GPUViewport *viewport = + ar->draw_buffer->viewport[ar->draw_buffer->stereo ? sima->iuser.multiview_eye : 0]; + DefaultFramebufferList *fbl = GPU_viewport_framebuffer_list_get(viewport); + GPU_framebuffer_bind(fbl->color_only_fb); + + /* XXX not supported yet, disabling for now */ + scene->r.scemode &= ~R_COMP_CROP; + + /* clear and setup matrix */ + UI_GetThemeColor3fv(TH_BACK, col); + GPU_clear_color(col[0], col[1], col[2], 0.0); + GPU_clear(GPU_COLOR_BIT); + + image_user_refresh_scene(C, sima); + + /* we set view2d from own zoom and offset each time */ + image_main_region_set_view2d(sima, ar); + + /* we draw image in pixelspace */ + draw_image_main(C, ar); + + /* and uvs in 0.0-1.0 space */ + UI_view2d_view_ortho(v2d); + + ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW); + + ED_uvedit_draw_main(sima, ar, scene, view_layer, obedit, obact, depsgraph); + + /* check for mask (delay draw) */ + if (ED_space_image_show_uvedit(sima, obedit)) { + /* pass */ + } + else if (sima->mode == SI_MODE_MASK) { + mask = ED_space_image_get_mask(sima); + } + else if (ED_space_image_paint_curve(C)) { + curve = true; + } + + ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_VIEW); + + if (sima->flag & SI_SHOW_GPENCIL) { + /* Grease Pencil too (in addition to UV's) */ + draw_image_grease_pencil((bContext *)C, true); + } + + /* sample line */ + draw_image_sample_line(sima); + + UI_view2d_view_restore(C); + + if (sima->flag & SI_SHOW_GPENCIL) { + /* draw Grease Pencil - screen space only */ + draw_image_grease_pencil((bContext *)C, false); + } + + if (mask) { + Image *image = ED_space_image(sima); + int width, height, show_viewer; + float aspx, aspy; + + show_viewer = (image && image->source == IMA_SRC_VIEWER); + + if (show_viewer) { + /* ED_space_image_get* will acquire image buffer which requires + * lock here by the same reason why lock is needed in draw_image_main + */ + BLI_thread_lock(LOCK_DRAW_IMAGE); + } + + ED_space_image_get_size(sima, &width, &height); + ED_space_image_get_aspect(sima, &aspx, &aspy); + + if (show_viewer) { + BLI_thread_unlock(LOCK_DRAW_IMAGE); + } + + ED_mask_draw_region(mask, + ar, + sima->mask_info.draw_flag, + sima->mask_info.draw_type, + sima->mask_info.overlay_mode, + width, + height, + aspx, + aspy, + true, + false, + NULL, + C); + + UI_view2d_view_ortho(v2d); + ED_image_draw_cursor(ar, sima->cursor); + UI_view2d_view_restore(C); + } + else if (curve) { + UI_view2d_view_ortho(v2d); + ED_image_draw_cursor(ar, sima->cursor); + UI_view2d_view_restore(C); + } + + WM_gizmomap_draw(ar->gizmo_map, C, WM_GIZMOMAP_DRAWSTEP_2D); + + draw_image_cache(C, ar); + + /* scrollers? */ #if 0 - scrollers = UI_view2d_scrollers_calc(C, v2d, V2D_UNIT_VALUES, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY); - UI_view2d_scrollers_draw(C, v2d, scrollers); - UI_view2d_scrollers_free(scrollers); + scrollers = UI_view2d_scrollers_calc(C, v2d, V2D_UNIT_VALUES, V2D_GRID_CLAMP, V2D_ARG_DUMMY, V2D_ARG_DUMMY); + UI_view2d_scrollers_draw(C, v2d, scrollers); + UI_view2d_scrollers_free(scrollers); #endif } static void image_main_region_listener( - wmWindow *UNUSED(win), ScrArea *sa, ARegion *ar, - wmNotifier *wmn, const Scene *UNUSED(scene)) + wmWindow *UNUSED(win), ScrArea *sa, ARegion *ar, wmNotifier *wmn, const Scene *UNUSED(scene)) { - /* context changes */ - switch (wmn->category) { - case NC_GEOM: - if (ELEM(wmn->data, ND_DATA, ND_SELECT)) { - WM_gizmomap_tag_refresh(ar->gizmo_map); - } - break; - case NC_GPENCIL: - if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) { - ED_region_tag_redraw(ar); - } - else if (wmn->data & ND_GPENCIL_EDITMODE) { - ED_region_tag_redraw(ar); - } - break; - case NC_IMAGE: - if (wmn->action == NA_PAINTING) { - ED_region_tag_redraw(ar); - } - WM_gizmomap_tag_refresh(ar->gizmo_map); - break; - case NC_MATERIAL: - if (wmn->data == ND_SHADING_LINKS) { - SpaceImage *sima = sa->spacedata.first; - - if (sima->iuser.scene && (sima->iuser.scene->toolsettings->uv_flag & UV_SHOW_SAME_IMAGE)) { - ED_region_tag_redraw(ar); - } - } - break; - case NC_SCREEN: - if (ELEM(wmn->data, ND_LAYER)) { - ED_region_tag_redraw(ar); - } - break; - } + /* context changes */ + switch (wmn->category) { + case NC_GEOM: + if (ELEM(wmn->data, ND_DATA, ND_SELECT)) { + WM_gizmomap_tag_refresh(ar->gizmo_map); + } + break; + case NC_GPENCIL: + if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) { + ED_region_tag_redraw(ar); + } + else if (wmn->data & ND_GPENCIL_EDITMODE) { + ED_region_tag_redraw(ar); + } + break; + case NC_IMAGE: + if (wmn->action == NA_PAINTING) { + ED_region_tag_redraw(ar); + } + WM_gizmomap_tag_refresh(ar->gizmo_map); + break; + case NC_MATERIAL: + if (wmn->data == ND_SHADING_LINKS) { + SpaceImage *sima = sa->spacedata.first; + + if (sima->iuser.scene && (sima->iuser.scene->toolsettings->uv_flag & UV_SHOW_SAME_IMAGE)) { + ED_region_tag_redraw(ar); + } + } + break; + case NC_SCREEN: + if (ELEM(wmn->data, ND_LAYER)) { + ED_region_tag_redraw(ar); + } + break; + } } /* *********************** buttons region ************************ */ @@ -797,78 +797,81 @@ static void image_main_region_listener( /* add handlers, stuff you only do once or on area/region changes */ static void image_buttons_region_init(wmWindowManager *wm, ARegion *ar) { - wmKeyMap *keymap; + wmKeyMap *keymap; - ar->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; - ED_region_panels_init(wm, ar); + ar->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; + ED_region_panels_init(wm, ar); - keymap = WM_keymap_ensure(wm->defaultconf, "Image Generic", SPACE_IMAGE, 0); - WM_event_add_keymap_handler(&ar->handlers, keymap); + keymap = WM_keymap_ensure(wm->defaultconf, "Image Generic", SPACE_IMAGE, 0); + WM_event_add_keymap_handler(&ar->handlers, keymap); } static void image_buttons_region_draw(const bContext *C, ARegion *ar) { - SpaceImage *sima = CTX_wm_space_image(C); - Scene *scene = CTX_data_scene(C); - void *lock; - ImBuf *ibuf = ED_space_image_acquire_buffer(sima, &lock); - /* XXX performance regression if name of scopes category changes! */ - PanelCategoryStack *category = UI_panel_category_active_find(ar, "Scopes"); - - /* only update scopes if scope category is active */ - if (category) { - if (ibuf) { - if (!sima->scopes.ok) { - BKE_histogram_update_sample_line(&sima->sample_line_hist, ibuf, &scene->view_settings, &scene->display_settings); - } - if (sima->image->flag & IMA_VIEW_AS_RENDER) { - ED_space_image_scopes_update(C, sima, ibuf, true); - } - else { - ED_space_image_scopes_update(C, sima, ibuf, false); - } - } - } - ED_space_image_release_buffer(sima, ibuf, lock); - - ED_region_panels(C, ar); + SpaceImage *sima = CTX_wm_space_image(C); + Scene *scene = CTX_data_scene(C); + void *lock; + ImBuf *ibuf = ED_space_image_acquire_buffer(sima, &lock); + /* XXX performance regression if name of scopes category changes! */ + PanelCategoryStack *category = UI_panel_category_active_find(ar, "Scopes"); + + /* only update scopes if scope category is active */ + if (category) { + if (ibuf) { + if (!sima->scopes.ok) { + BKE_histogram_update_sample_line( + &sima->sample_line_hist, ibuf, &scene->view_settings, &scene->display_settings); + } + if (sima->image->flag & IMA_VIEW_AS_RENDER) { + ED_space_image_scopes_update(C, sima, ibuf, true); + } + else { + ED_space_image_scopes_update(C, sima, ibuf, false); + } + } + } + ED_space_image_release_buffer(sima, ibuf, lock); + + ED_region_panels(C, ar); } -static void image_buttons_region_listener( - wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar, - wmNotifier *wmn, const Scene *UNUSED(scene)) +static void image_buttons_region_listener(wmWindow *UNUSED(win), + ScrArea *UNUSED(sa), + ARegion *ar, + wmNotifier *wmn, + const Scene *UNUSED(scene)) { - /* context changes */ - switch (wmn->category) { - case NC_TEXTURE: - case NC_MATERIAL: - /* sending by texture render job and needed to properly update displaying - * brush texture icon */ - ED_region_tag_redraw(ar); - break; - case NC_SCENE: - switch (wmn->data) { - case ND_MODE: - case ND_RENDER_RESULT: - case ND_COMPO_RESULT: - ED_region_tag_redraw(ar); - break; - } - break; - case NC_IMAGE: - if (wmn->action != NA_PAINTING) { - ED_region_tag_redraw(ar); - } - break; - case NC_NODE: - ED_region_tag_redraw(ar); - break; - case NC_GPENCIL: - if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) { - ED_region_tag_redraw(ar); - } - break; - } + /* context changes */ + switch (wmn->category) { + case NC_TEXTURE: + case NC_MATERIAL: + /* sending by texture render job and needed to properly update displaying + * brush texture icon */ + ED_region_tag_redraw(ar); + break; + case NC_SCENE: + switch (wmn->data) { + case ND_MODE: + case ND_RENDER_RESULT: + case ND_COMPO_RESULT: + ED_region_tag_redraw(ar); + break; + } + break; + case NC_IMAGE: + if (wmn->action != NA_PAINTING) { + ED_region_tag_redraw(ar); + } + break; + case NC_NODE: + ED_region_tag_redraw(ar); + break; + case NC_GPENCIL: + if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) { + ED_region_tag_redraw(ar); + } + break; + } } /* *********************** scopes region ************************ */ @@ -876,56 +879,57 @@ static void image_buttons_region_listener( /* add handlers, stuff you only do once or on area/region changes */ static void image_tools_region_init(wmWindowManager *wm, ARegion *ar) { - wmKeyMap *keymap; + wmKeyMap *keymap; - ar->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; - ED_region_panels_init(wm, ar); + ar->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; + ED_region_panels_init(wm, ar); - keymap = WM_keymap_ensure(wm->defaultconf, "Image Generic", SPACE_IMAGE, 0); - WM_event_add_keymap_handler(&ar->handlers, keymap); + keymap = WM_keymap_ensure(wm->defaultconf, "Image Generic", SPACE_IMAGE, 0); + WM_event_add_keymap_handler(&ar->handlers, keymap); } static void image_tools_region_draw(const bContext *C, ARegion *ar) { - ED_region_panels(C, ar); + ED_region_panels(C, ar); } -static void image_tools_region_listener( - wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar, - wmNotifier *wmn, const Scene *UNUSED(scene)) +static void image_tools_region_listener(wmWindow *UNUSED(win), + ScrArea *UNUSED(sa), + ARegion *ar, + wmNotifier *wmn, + const Scene *UNUSED(scene)) { - /* context changes */ - switch (wmn->category) { - case NC_GPENCIL: - if (wmn->data == ND_DATA || ELEM(wmn->action, NA_EDITED, NA_SELECTED)) { - ED_region_tag_redraw(ar); - } - break; - case NC_BRUSH: - /* NA_SELECTED is used on brush changes */ - if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) { - ED_region_tag_redraw(ar); - } - break; - case NC_SCENE: - switch (wmn->data) { - case ND_MODE: - case ND_RENDER_RESULT: - case ND_COMPO_RESULT: - ED_region_tag_redraw(ar); - break; - } - break; - case NC_IMAGE: - if (wmn->action != NA_PAINTING) { - ED_region_tag_redraw(ar); - } - break; - case NC_NODE: - ED_region_tag_redraw(ar); - break; - - } + /* context changes */ + switch (wmn->category) { + case NC_GPENCIL: + if (wmn->data == ND_DATA || ELEM(wmn->action, NA_EDITED, NA_SELECTED)) { + ED_region_tag_redraw(ar); + } + break; + case NC_BRUSH: + /* NA_SELECTED is used on brush changes */ + if (ELEM(wmn->action, NA_EDITED, NA_SELECTED)) { + ED_region_tag_redraw(ar); + } + break; + case NC_SCENE: + switch (wmn->data) { + case ND_MODE: + case ND_RENDER_RESULT: + case ND_COMPO_RESULT: + ED_region_tag_redraw(ar); + break; + } + break; + case NC_IMAGE: + if (wmn->action != NA_PAINTING) { + ED_region_tag_redraw(ar); + } + break; + case NC_NODE: + ED_region_tag_redraw(ar); + break; + } } /************************* header region **************************/ @@ -933,67 +937,69 @@ static void image_tools_region_listener( /* add handlers, stuff you only do once or on area/region changes */ static void image_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) { - ED_region_header_init(ar); + ED_region_header_init(ar); } static void image_header_region_draw(const bContext *C, ARegion *ar) { - ScrArea *sa = CTX_wm_area(C); - SpaceImage *sima = sa->spacedata.first; + ScrArea *sa = CTX_wm_area(C); + SpaceImage *sima = sa->spacedata.first; - image_user_refresh_scene(C, sima); + image_user_refresh_scene(C, sima); - ED_region_header(C, ar); + ED_region_header(C, ar); } -static void image_header_region_listener( - wmWindow *UNUSED(win), ScrArea *UNUSED(sa), ARegion *ar, - wmNotifier *wmn, const Scene *UNUSED(scene)) +static void image_header_region_listener(wmWindow *UNUSED(win), + ScrArea *UNUSED(sa), + ARegion *ar, + wmNotifier *wmn, + const Scene *UNUSED(scene)) { - /* context changes */ - switch (wmn->category) { - case NC_SCENE: - switch (wmn->data) { - case ND_MODE: - case ND_TOOLSETTINGS: - ED_region_tag_redraw(ar); - break; - } - break; - case NC_GEOM: - switch (wmn->data) { - case ND_DATA: - case ND_SELECT: - ED_region_tag_redraw(ar); - break; - } - break; - } + /* context changes */ + switch (wmn->category) { + case NC_SCENE: + switch (wmn->data) { + case ND_MODE: + case ND_TOOLSETTINGS: + ED_region_tag_redraw(ar); + break; + } + break; + case NC_GEOM: + switch (wmn->data) { + case ND_DATA: + case ND_SELECT: + ED_region_tag_redraw(ar); + break; + } + break; + } } static void image_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID *new_id) { - SpaceImage *simg = (SpaceImage *)slink; - - if (!ELEM(GS(old_id->name), ID_IM, ID_GD, ID_MSK)) { - return; - } - - if ((ID *)simg->image == old_id) { - simg->image = (Image *)new_id; - id_us_ensure_real(new_id); - } - - if ((ID *)simg->gpd == old_id) { - simg->gpd = (bGPdata *)new_id; - id_us_min(old_id); - id_us_plus(new_id); - } - - if ((ID *)simg->mask_info.mask == old_id) { - simg->mask_info.mask = (Mask *)new_id; - id_us_ensure_real(new_id); - } + SpaceImage *simg = (SpaceImage *)slink; + + if (!ELEM(GS(old_id->name), ID_IM, ID_GD, ID_MSK)) { + return; + } + + if ((ID *)simg->image == old_id) { + simg->image = (Image *)new_id; + id_us_ensure_real(new_id); + } + + if ((ID *)simg->gpd == old_id) { + simg->gpd = (bGPdata *)new_id; + id_us_min(old_id); + id_us_plus(new_id); + } + + if ((ID *)simg->mask_info.mask == old_id) { + simg->mask_info.mask = (Mask *)new_id; + id_us_ensure_real(new_id); + } } /** @@ -1003,28 +1009,29 @@ static void image_id_remap(ScrArea *UNUSED(sa), SpaceLink *slink, ID *old_id, ID */ static int image_space_subtype_get(ScrArea *sa) { - SpaceImage *sima = sa->spacedata.first; - return sima->mode == SI_MODE_UV ? SI_MODE_UV : SI_MODE_VIEW; + SpaceImage *sima = sa->spacedata.first; + return sima->mode == SI_MODE_UV ? SI_MODE_UV : SI_MODE_VIEW; } static void image_space_subtype_set(ScrArea *sa, int value) { - SpaceImage *sima = sa->spacedata.first; - if (value == SI_MODE_UV) { - if (sima->mode != SI_MODE_UV) { - sima->mode_prev = sima->mode; - } - sima->mode = value; - } - else { - sima->mode = sima->mode_prev; - } + SpaceImage *sima = sa->spacedata.first; + if (value == SI_MODE_UV) { + if (sima->mode != SI_MODE_UV) { + sima->mode_prev = sima->mode; + } + sima->mode = value; + } + else { + sima->mode = sima->mode_prev; + } } -static void image_space_subtype_item_extend( - bContext *UNUSED(C), EnumPropertyItem **item, int *totitem) +static void image_space_subtype_item_extend(bContext *UNUSED(C), + EnumPropertyItem **item, + int *totitem) { - RNA_enum_items_add(item, totitem, rna_enum_space_image_mode_items); + RNA_enum_items_add(item, totitem, rna_enum_space_image_mode_items); } /**************************** spacetype *****************************/ @@ -1032,77 +1039,77 @@ static void image_space_subtype_item_extend( /* only called once, from space/spacetypes.c */ void ED_spacetype_image(void) { - SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype image"); - ARegionType *art; - - st->spaceid = SPACE_IMAGE; - strncpy(st->name, "Image", BKE_ST_MAXNAME); - - st->new = image_new; - st->free = image_free; - st->init = image_init; - st->duplicate = image_duplicate; - st->operatortypes = image_operatortypes; - st->keymap = image_keymap; - st->dropboxes = image_dropboxes; - st->refresh = image_refresh; - st->listener = image_listener; - st->context = image_context; - st->gizmos = image_widgets; - st->id_remap = image_id_remap; - st->space_subtype_item_extend = image_space_subtype_item_extend; - st->space_subtype_get = image_space_subtype_get; - st->space_subtype_set = image_space_subtype_set; - - /* regions: main window */ - art = MEM_callocN(sizeof(ARegionType), "spacetype image region"); - art->regionid = RGN_TYPE_WINDOW; - art->keymapflag = ED_KEYMAP_GIZMO | ED_KEYMAP_TOOL | ED_KEYMAP_FRAMES | ED_KEYMAP_GPENCIL; - art->init = image_main_region_init; - art->draw = image_main_region_draw; - art->listener = image_main_region_listener; - BLI_addhead(&st->regiontypes, art); - - /* regions: listview/buttons/scopes */ - art = MEM_callocN(sizeof(ARegionType), "spacetype image region"); - art->regionid = RGN_TYPE_UI; - art->prefsizex = 220; // XXX - art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES; - art->listener = image_buttons_region_listener; - art->init = image_buttons_region_init; - art->draw = image_buttons_region_draw; - BLI_addhead(&st->regiontypes, art); - - ED_uvedit_buttons_register(art); - image_buttons_register(art); - - /* regions: tool(bar) */ - art = MEM_callocN(sizeof(ARegionType), "spacetype image region"); - art->regionid = RGN_TYPE_TOOLS; - art->prefsizex = 58; /* XXX */ - art->prefsizey = 50; /* XXX */ - art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES; - art->listener = image_tools_region_listener; - art->message_subscribe = ED_region_generic_tools_region_message_subscribe; - art->snap_size = ED_region_generic_tools_region_snap_size; - art->init = image_tools_region_init; - art->draw = image_tools_region_draw; - BLI_addhead(&st->regiontypes, art); - - /* regions: header */ - art = MEM_callocN(sizeof(ARegionType), "spacetype image region"); - art->regionid = RGN_TYPE_HEADER; - art->prefsizey = HEADERY; - art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER; - art->listener = image_header_region_listener; - art->init = image_header_region_init; - art->draw = image_header_region_draw; - - BLI_addhead(&st->regiontypes, art); - - /* regions: hud */ - art = ED_area_type_hud(st->spaceid); - BLI_addhead(&st->regiontypes, art); - - BKE_spacetype_register(st); + SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype image"); + ARegionType *art; + + st->spaceid = SPACE_IMAGE; + strncpy(st->name, "Image", BKE_ST_MAXNAME); + + st->new = image_new; + st->free = image_free; + st->init = image_init; + st->duplicate = image_duplicate; + st->operatortypes = image_operatortypes; + st->keymap = image_keymap; + st->dropboxes = image_dropboxes; + st->refresh = image_refresh; + st->listener = image_listener; + st->context = image_context; + st->gizmos = image_widgets; + st->id_remap = image_id_remap; + st->space_subtype_item_extend = image_space_subtype_item_extend; + st->space_subtype_get = image_space_subtype_get; + st->space_subtype_set = image_space_subtype_set; + + /* regions: main window */ + art = MEM_callocN(sizeof(ARegionType), "spacetype image region"); + art->regionid = RGN_TYPE_WINDOW; + art->keymapflag = ED_KEYMAP_GIZMO | ED_KEYMAP_TOOL | ED_KEYMAP_FRAMES | ED_KEYMAP_GPENCIL; + art->init = image_main_region_init; + art->draw = image_main_region_draw; + art->listener = image_main_region_listener; + BLI_addhead(&st->regiontypes, art); + + /* regions: listview/buttons/scopes */ + art = MEM_callocN(sizeof(ARegionType), "spacetype image region"); + art->regionid = RGN_TYPE_UI; + art->prefsizex = 220; // XXX + art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES; + art->listener = image_buttons_region_listener; + art->init = image_buttons_region_init; + art->draw = image_buttons_region_draw; + BLI_addhead(&st->regiontypes, art); + + ED_uvedit_buttons_register(art); + image_buttons_register(art); + + /* regions: tool(bar) */ + art = MEM_callocN(sizeof(ARegionType), "spacetype image region"); + art->regionid = RGN_TYPE_TOOLS; + art->prefsizex = 58; /* XXX */ + art->prefsizey = 50; /* XXX */ + art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES; + art->listener = image_tools_region_listener; + art->message_subscribe = ED_region_generic_tools_region_message_subscribe; + art->snap_size = ED_region_generic_tools_region_snap_size; + art->init = image_tools_region_init; + art->draw = image_tools_region_draw; + BLI_addhead(&st->regiontypes, art); + + /* regions: header */ + art = MEM_callocN(sizeof(ARegionType), "spacetype image region"); + art->regionid = RGN_TYPE_HEADER; + art->prefsizey = HEADERY; + art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER; + art->listener = image_header_region_listener; + art->init = image_header_region_init; + art->draw = image_header_region_draw; + + BLI_addhead(&st->regiontypes, art); + + /* regions: hud */ + art = ED_area_type_hud(st->spaceid); + BLI_addhead(&st->regiontypes, art); + + BKE_spacetype_register(st); } |