forked from blender/blender
main sync #3
@ -486,6 +486,8 @@ const char *CustomData_get_active_layer_name(const struct CustomData *data, int
|
|||||||
*/
|
*/
|
||||||
const char *CustomData_get_render_layer_name(const struct CustomData *data, int type);
|
const char *CustomData_get_render_layer_name(const struct CustomData *data, int type);
|
||||||
|
|
||||||
|
bool CustomData_layer_is_anonymous(const struct CustomData *data, int type, int n);
|
||||||
|
|
||||||
void CustomData_bmesh_set(const struct CustomData *data,
|
void CustomData_bmesh_set(const struct CustomData *data,
|
||||||
void *block,
|
void *block,
|
||||||
int type,
|
int type,
|
||||||
|
@ -2686,6 +2686,15 @@ void CustomData_clear_layer_flag(CustomData *data, const int type, const int fla
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CustomData_layer_is_anonymous(const struct CustomData *data, int type, int n)
|
||||||
|
{
|
||||||
|
const int layer_index = CustomData_get_layer_index_n(data, type, n);
|
||||||
|
|
||||||
|
BLI_assert(layer_index >= 0);
|
||||||
|
|
||||||
|
return data->layers[layer_index].anonymous_id != nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
static bool customData_resize(CustomData *data, const int amount)
|
static bool customData_resize(CustomData *data, const int amount)
|
||||||
{
|
{
|
||||||
CustomDataLayer *tmp = static_cast<CustomDataLayer *>(
|
CustomDataLayer *tmp = static_cast<CustomDataLayer *>(
|
||||||
|
@ -358,7 +358,7 @@ static DRW_MeshCDMask mesh_cd_calc_used_gpu_layers(const Object *object,
|
|||||||
CustomData_get_named_layer(cd_ldata, CD_PROP_FLOAT2, name) :
|
CustomData_get_named_layer(cd_ldata, CD_PROP_FLOAT2, name) :
|
||||||
CustomData_get_render_layer(cd_ldata, CD_PROP_FLOAT2);
|
CustomData_get_render_layer(cd_ldata, CD_PROP_FLOAT2);
|
||||||
}
|
}
|
||||||
if (layer != -1) {
|
if (layer != -1 && !CustomData_layer_is_anonymous(cd_ldata, CD_PROP_FLOAT2, layer)) {
|
||||||
cd_used.uv |= (1 << layer);
|
cd_used.uv |= (1 << layer);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -248,7 +248,7 @@ static void extract_edituv_stretch_angle_init_subdiv(const DRWSubdivCache *subdi
|
|||||||
/* HACK to fix #68857 */
|
/* HACK to fix #68857 */
|
||||||
if (mr->extract_type == MR_EXTRACT_BMESH && cache->cd_used.edit_uv == 1) {
|
if (mr->extract_type == MR_EXTRACT_BMESH && cache->cd_used.edit_uv == 1) {
|
||||||
int layer = CustomData_get_active_layer(cd_ldata, CD_PROP_FLOAT2);
|
int layer = CustomData_get_active_layer(cd_ldata, CD_PROP_FLOAT2);
|
||||||
if (layer != -1) {
|
if (layer != -1 && !CustomData_layer_is_anonymous(cd_ldata, CD_PROP_FLOAT2, layer)) {
|
||||||
uv_layers |= (1 << layer);
|
uv_layers |= (1 << layer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ static bool mesh_extract_uv_format_init(GPUVertFormat *format,
|
|||||||
/* HACK to fix #68857 */
|
/* HACK to fix #68857 */
|
||||||
if (extract_type == MR_EXTRACT_BMESH && cache->cd_used.edit_uv == 1) {
|
if (extract_type == MR_EXTRACT_BMESH && cache->cd_used.edit_uv == 1) {
|
||||||
int layer = CustomData_get_active_layer(cd_ldata, CD_PROP_FLOAT2);
|
int layer = CustomData_get_active_layer(cd_ldata, CD_PROP_FLOAT2);
|
||||||
if (layer != -1) {
|
if (layer != -1 && !CustomData_layer_is_anonymous(cd_ldata, CD_PROP_FLOAT2, layer)) {
|
||||||
uv_layers |= (1 << layer);
|
uv_layers |= (1 << layer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -470,7 +470,7 @@ static struct PyMethodDef pygpu_state__tp_methods[] = {
|
|||||||
pygpu_state_scissor_get_doc},
|
pygpu_state_scissor_get_doc},
|
||||||
{"scissor_test_set",
|
{"scissor_test_set",
|
||||||
(PyCFunction)pygpu_state_scissor_test_set,
|
(PyCFunction)pygpu_state_scissor_test_set,
|
||||||
METH_VARARGS,
|
METH_O,
|
||||||
pygpu_state_scissor_test_set_doc},
|
pygpu_state_scissor_test_set_doc},
|
||||||
{"line_width_set",
|
{"line_width_set",
|
||||||
(PyCFunction)pygpu_state_line_width_set,
|
(PyCFunction)pygpu_state_line_width_set,
|
||||||
|
Loading…
Reference in New Issue
Block a user