blender
/
blender
136
405
Fork 587
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: remove redundant cursor copy, print

This commit is contained in:
Campbell Barton 2021-10-08 11:57:42 +11:00
parent 23791db145
commit 29e496e768
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/startup/bl_ui/space_topbar.py
View File

@ -662,7 +662,6 @@ class TOPBAR_MT_window(Menu):
# - From the top-bar, the text replaces the file-menu (not so bad but strange).
# - From menu-search it replaces the area that the user may want to screen-shot.
# Setting the context to screen causes the status to show in the global status-bar.
print(layout.operator_context)
layout.operator_context = 'INVOKE_SCREEN'
layout.operator("screen.screenshot_area")
layout.operator_context = operator_context_default

9
source/blender/editors/uvedit/uvedit_unwrap_ops.c
View File

@ -171,7 +171,7 @@ bool ED_uvedit_udim_params_from_image_space(const SpaceImage *sima,
int active_udim = 1001;
/* NOTE: Presently, when UDIM grid and tiled image are present together, only active tile for
* the tiled image is considered. */
Image *image = sima->image;
const Image *image = sima->image;
if (image && image->source == IMA_SRC_TILED) {
ImageTile *active_tile = BLI_findlink(&image->tiles, image->active_tile_index);
if (active_tile) {
@ -181,11 +181,10 @@ bool ED_uvedit_udim_params_from_image_space(const SpaceImage *sima,
else {
/* TODO: Support storing an active UDIM when there are no tiles present.
* Until then, use 2D cursor to find the active tile index for the UDIM grid. */
const float cursor_loc[2] = {sima->cursor[0], sima->cursor[1]};
if (uv_coords_isect_udim(sima->image, sima->tile_grid_shape, cursor_loc)) {
if (uv_coords_isect_udim(sima->image, sima->tile_grid_shape, sima->cursor)) {
int tile_number = 1001;
tile_number += floorf(cursor_loc[1]) * 10;
tile_number += floorf(cursor_loc[0]);
tile_number += floorf(sima->cursor[1]) * 10;
tile_number += floorf(sima->cursor[0]);
active_udim = tile_number;
}
}