Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +7 -6
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 254e3e133f - Show all commits

1
source/blender/blenkernel/intern/attribute.cc
View File

@ -830,7 +830,6 @@ CustomDataLayer *BKE_id_attributes_color_find(const ID *id, const char *name)
return nullptr; return nullptr;
} }
const char *BKE_uv_map_vert_select_name_get(const char *uv_map_name, char *buffer) const char *BKE_uv_map_vert_select_name_get(const char *uv_map_name, char *buffer)
{ {
BLI_assert(strlen(UV_VERTSEL_NAME) == 2); BLI_assert(strlen(UV_VERTSEL_NAME) == 2);

6
source/blender/editors/interface/interface_handlers.cc
View File

@ -8768,9 +8768,9 @@ uiBlock *UI_region_block_find_mouse_over(const ARegion *region, const int xy[2],
} }
uiBut *UI_region_active_but_prop_get(const ARegion *region, uiBut *UI_region_active_but_prop_get(const ARegion *region,
PointerRNA *r_ptr, PointerRNA *r_ptr,
PropertyRNA **r_prop, PropertyRNA **r_prop,
int *r_index) int *r_index)
{ {
uiBut *activebut = UI_region_active_but_get(region); uiBut *activebut = UI_region_active_but_get(region);

6
source/blender/imbuf/IMB_imbuf.h
View File

@ -677,8 +677,10 @@ void IMB_sampleImageAtLocation(
/** /**
* \attention defined in readimage.c * \attention defined in readimage.c
*/ */
struct ImBuf *IMB_loadifffile( struct ImBuf *IMB_loadifffile(int file,
int file, int flags, char colorspace[IM_MAX_SPACE], const char *descr); int flags,
char colorspace[IM_MAX_SPACE],
const char *descr);
/** /**
* \attention defined in scaling.c * \attention defined in scaling.c