Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 182 Files Changed 881 +19 -24
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 89e12ddf86 - Show all commits

33
source/blender/draw/intern/draw_attributes.cc
View File

@ -4,20 +4,15 @@
#include "draw_attributes.hh" #include "draw_attributes.hh"
/* Return true if the given DRW_AttributeRequest is already in the requests. */ /* Return true if the given DRW_AttributeRequest is already in the requests. */
static bool drw_attributes_has_request(const DRW_Attributes *requests, DRW_AttributeRequest req) static bool drw_attributes_has_request(const DRW_Attributes *requests,
const DRW_AttributeRequest &req)
{ {
for (int i = 0; i < requests->num_requests; i++) { for (int i = 0; i < requests->num_requests; i++) {
const DRW_AttributeRequest src_req = requests->requests[i]; const DRW_AttributeRequest &src_req = requests->requests[i];
if (src_req.domain != req.domain) { if (src_req.domain == req.domain && src_req.layer_index == req.layer_index &&
continue; src_req.cd_type == req.cd_type) {
return true;
} }
if (src_req.layer_index != req.layer_index) {
continue;
}
if (src_req.cd_type != req.cd_type) {
continue;
}
return true;
} }
return false; return false;
} }
@ -61,14 +56,15 @@ bool drw_attributes_overlap(const DRW_Attributes *a, const DRW_Attributes *b)
return true; return true;
} }
DRW_AttributeRequest *drw_attributes_add_request(DRW_Attributes *attrs, void drw_attributes_add_request(DRW_Attributes *attrs,
const char *name, const char *name,
const eCustomDataType type, const eCustomDataType type,
const int layer_index, const int layer_index,
const eAttrDomain domain) const eAttrDomain domain)
{ {
if (attrs->num_requests >= GPU_MAX_ATTR) { if (attrs->num_requests >= GPU_MAX_ATTR ||
return nullptr; drw_attributes_has_request(attrs, {type, layer_index, domain})) {
return;
} }
DRW_AttributeRequest *req = &attrs->requests[attrs->num_requests]; DRW_AttributeRequest *req = &attrs->requests[attrs->num_requests];
@ -77,7 +73,6 @@ DRW_AttributeRequest *drw_attributes_add_request(DRW_Attributes *attrs,
req->layer_index = layer_index; req->layer_index = layer_index;
req->domain = domain; req->domain = domain;
attrs->num_requests += 1; attrs->num_requests += 1;
return req;
} }
bool drw_custom_data_match_attribute(const CustomData *custom_data, bool drw_custom_data_match_attribute(const CustomData *custom_data,

10
source/blender/draw/intern/draw_attributes.hh
View File

@ -60,11 +60,11 @@ void drw_attributes_merge(DRW_Attributes *dst,
/* Return true if all requests in b are in a. */ /* Return true if all requests in b are in a. */
bool drw_attributes_overlap(const DRW_Attributes *a, const DRW_Attributes *b); bool drw_attributes_overlap(const DRW_Attributes *a, const DRW_Attributes *b);
DRW_AttributeRequest *drw_attributes_add_request(DRW_Attributes *attrs, void drw_attributes_add_request(DRW_Attributes *attrs,
const char *name, const char *name,
eCustomDataType data_type, eCustomDataType data_type,
int layer_index, int layer_index,
eAttrDomain domain); eAttrDomain domain);
bool drw_custom_data_match_attribute(const CustomData *custom_data, bool drw_custom_data_match_attribute(const CustomData *custom_data,
const char *name, const char *name,