blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

UI: Asset Shelf (Experimental Feature) #104831

Closed
Julian Eisel wants to merge 399 commits from asset-shelf into main
pull from: asset-shelf
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 30 Commits 399 Files Changed - +129 -108
4 changed files with 129 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b6ec445c6a - Show all commits

14
source/blender/blenlib/intern/array_utils.cc
View File

@ -3,6 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "BLI_array_utils.hh"
#include "BLI_threads.h"
#include "atomic_ops.h"
@ -49,8 +50,17 @@ void gather(const GSpan src, const IndexMask &indices, GMutableSpan dst, const i
void count_indices(const Span<int> indices, MutableSpan<int> counts)
{
for (const int i : indices) {
counts[i]++;
if (indices.size() < 8192 || BLI_system_thread_count() < 4) {
for (const int i : indices) {
counts[i]++;
}
}
else {
threading::parallel_for(indices.index_range(), 4096, [&](const IndexRange range) {
for (const int i : indices.slice(range)) {
atomic_add_and_fetch_int32(&counts[i], 1);
}
});
}
}

1
source/blender/editors/screen/screen_edit.c
View File

@ -767,6 +767,7 @@ static void screen_regions_poll(bContext *C, const wmWindow *win, bScreen *scree
if (any_changed) {
screen->do_refresh = true;
}
CTX_wm_area_set(C, prev_area);
CTX_wm_region_set(C, prev_region);
}

220
source/blender/makesrna/intern/rna_mesh.cc
View File

@ -267,7 +267,7 @@ static int rna_MeshVertex_index_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const blender::float3 *position = static_cast<const blender::float3 *>(ptr->data);
const int index = (int)(position - mesh->vert_positions().data());
const int index = int(position - mesh->vert_positions().data());
BLI_assert(index >= 0);
BLI_assert(index < mesh->totvert);
return index;
@ -277,10 +277,10 @@ static int rna_MeshEdge_index_get(PointerRNA *ptr)
{
using namespace blender;
const Mesh *mesh = rna_mesh(ptr);
const int2 *edge = (int2 *)ptr->data;
const int2 *edges = static_cast<const int2 *>(
const blender::int2 *edge = static_cast<const blender::int2 *>(ptr->data);
const blender::int2 *edges = static_cast<const blender::int2 *>(
CustomData_get_layer_named(&mesh->edata, CD_PROP_INT32_2D, ".edge_verts"));
const int index = (int)(edge - edges);
const int index = int(edge - edges);
BLI_assert(index >= 0);
BLI_assert(index < mesh->totedge);
return index;
@ -289,8 +289,8 @@ static int rna_MeshEdge_index_get(PointerRNA *ptr)
static int rna_MeshPolygon_index_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const int *poly_offset = (const int *)ptr->data;
const int index = (int)(poly_offset - BKE_mesh_poly_offsets(mesh));
const int *poly_offset = static_cast<const int *>(ptr->data);
const int index = int(poly_offset - mesh->poly_offsets().data());
BLI_assert(index >= 0);
BLI_assert(index < mesh->totpoly);
return index;
@ -299,8 +299,8 @@ static int rna_MeshPolygon_index_get(PointerRNA *ptr)
static int rna_MeshLoop_index_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const int *corner_vert = (const int *)ptr->data;
const int index = (int)(corner_vert - mesh->corner_verts().data());
const int *corner_vert = static_cast<const int *>(ptr->data);
const int index = int(corner_vert - mesh->corner_verts().data());
BLI_assert(index >= 0);
BLI_assert(index < mesh->totloop);
return index;
@ -309,8 +309,8 @@ static int rna_MeshLoop_index_get(PointerRNA *ptr)
static int rna_MeshLoopTriangle_index_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const MLoopTri *ltri = (MLoopTri *)ptr->data;
const int index = (int)(ltri - BKE_mesh_runtime_looptri_ensure(mesh));
const MLoopTri *tri = static_cast<const MLoopTri *>(ptr->data);
const int index = int(tri - mesh->looptris().data());
BLI_assert(index >= 0);
BLI_assert(index < BKE_mesh_runtime_looptri_len(mesh));
return index;
@ -320,18 +320,17 @@ static int rna_MeshLoopTriangle_polygon_index_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const int index = rna_MeshLoopTriangle_index_get(ptr);
const int *looptri_polys = BKE_mesh_runtime_looptri_polys_ensure(mesh);
return looptri_polys[index];
return mesh->looptri_polys()[index];
}
static void rna_Mesh_loop_triangles_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const MLoopTri *looptris = BKE_mesh_runtime_looptri_ensure(mesh);
const blender::Span<MLoopTri> looptris = mesh->looptris();
rna_iterator_array_begin(iter,
(void *)looptris,
const_cast<MLoopTri *>(looptris.data()),
sizeof(MLoopTri),
BKE_mesh_runtime_looptri_len(mesh),
looptris.size(),
false,
nullptr);
}
@ -351,7 +350,7 @@ int rna_Mesh_loop_triangles_lookup_int(PointerRNA *ptr, int index, PointerRNA *r
/* Casting away const is okay because this RNA type doesn't allow changing the value. */
r_ptr->owner_id = (ID *)&mesh->id;
r_ptr->type = &RNA_MeshLoopTriangle;
r_ptr->data = (void *)&BKE_mesh_runtime_looptri_ensure(mesh)[index];
r_ptr->data = const_cast<MLoopTri *>(&mesh->looptris()[index]);
return true;
}
@ -360,7 +359,7 @@ static void rna_Mesh_loop_triangle_polygons_begin(CollectionPropertyIterator *it
{
const Mesh *mesh = rna_mesh(ptr);
rna_iterator_array_begin(iter,
(void *)BKE_mesh_runtime_looptri_polys_ensure(mesh),
const_cast<int *>(mesh->looptri_polys().data()),
sizeof(int),
BKE_mesh_runtime_looptri_len(mesh),
false,
@ -376,7 +375,7 @@ int rna_Mesh_loop_triangle_polygons_lookup_int(PointerRNA *ptr, int index, Point
/* Casting away const is okay because this RNA type doesn't allow changing the value. */
r_ptr->owner_id = (ID *)&mesh->id;
r_ptr->type = &RNA_ReadOnlyInteger;
r_ptr->data = (void *)&BKE_mesh_runtime_looptri_polys_ensure(mesh)[index];
r_ptr->data = const_cast<int *>(&mesh->looptri_polys()[index]);
return true;
}
@ -401,8 +400,8 @@ static void rna_MeshVertex_normal_get(PointerRNA *ptr, float *value)
static bool rna_MeshVertex_hide_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const bool *hide_vert = (const bool *)CustomData_get_layer_named(
&mesh->vdata, CD_PROP_BOOL, ".hide_vert");
const bool *hide_vert = static_cast<const bool *>(
CustomData_get_layer_named(&mesh->vdata, CD_PROP_BOOL, ".hide_vert"));
const int index = rna_MeshVertex_index_get(ptr);
return hide_vert == nullptr ? false : hide_vert[index];
}
@ -410,15 +409,15 @@ static bool rna_MeshVertex_hide_get(PointerRNA *ptr)
static void rna_MeshVertex_hide_set(PointerRNA *ptr, bool value)
{
Mesh *mesh = rna_mesh(ptr);
bool *hide_vert = (bool *)CustomData_get_layer_named_for_write(
&mesh->vdata, CD_PROP_BOOL, ".hide_vert", mesh->totvert);
bool *hide_vert = static_cast<bool *>(CustomData_get_layer_named_for_write(
&mesh->vdata, CD_PROP_BOOL, ".hide_vert", mesh->totvert));
if (!hide_vert) {
if (!value) {
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element. */
return;
}
hide_vert = (bool *)CustomData_add_layer_named(
&mesh->vdata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totvert, ".hide_vert");
hide_vert = static_cast<bool *>(CustomData_add_layer_named(
&mesh->vdata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totvert, ".hide_vert"));
}
const int index = rna_MeshVertex_index_get(ptr);
hide_vert[index] = value;
@ -427,8 +426,8 @@ static void rna_MeshVertex_hide_set(PointerRNA *ptr, bool value)
static bool rna_MeshVertex_select_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const bool *select_vert = (const bool *)CustomData_get_layer_named(
&mesh->vdata, CD_PROP_BOOL, ".select_vert");
const bool *select_vert = static_cast<const bool *>(
CustomData_get_layer_named(&mesh->vdata, CD_PROP_BOOL, ".select_vert"));
const int index = rna_MeshVertex_index_get(ptr);
return select_vert == nullptr ? false : select_vert[index];
}
@ -436,15 +435,15 @@ static bool rna_MeshVertex_select_get(PointerRNA *ptr)
static void rna_MeshVertex_select_set(PointerRNA *ptr, bool value)
{
Mesh *mesh = rna_mesh(ptr);
bool *select_vert = (bool *)CustomData_get_layer_named_for_write(
&mesh->vdata, CD_PROP_BOOL, ".select_vert", mesh->totvert);
bool *select_vert = static_cast<bool *>(CustomData_get_layer_named_for_write(
&mesh->vdata, CD_PROP_BOOL, ".select_vert", mesh->totvert));
if (!select_vert) {
if (!value) {
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element. */
return;
}
select_vert = (bool *)CustomData_add_layer_named(
&mesh->vdata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totvert, ".select_vert");
select_vert = static_cast<bool *>(CustomData_add_layer_named(
&mesh->vdata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totvert, ".select_vert"));
}
const int index = rna_MeshVertex_index_get(ptr);
select_vert[index] = value;
@ -558,8 +557,8 @@ static void rna_MeshPolygon_normal_get(PointerRNA *ptr, float *values)
static bool rna_MeshPolygon_hide_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const bool *hide_poly = (const bool *)CustomData_get_layer_named(
&mesh->pdata, CD_PROP_BOOL, ".hide_poly");
const bool *hide_poly = static_cast<const bool *>(
CustomData_get_layer_named(&mesh->pdata, CD_PROP_BOOL, ".hide_poly"));
const int index = rna_MeshPolygon_index_get(ptr);
return hide_poly == nullptr ? false : hide_poly[index];
}
@ -567,15 +566,15 @@ static bool rna_MeshPolygon_hide_get(PointerRNA *ptr)
static void rna_MeshPolygon_hide_set(PointerRNA *ptr, bool value)
{
Mesh *mesh = rna_mesh(ptr);
bool *hide_poly = (bool *)CustomData_get_layer_named_for_write(
&mesh->pdata, CD_PROP_BOOL, ".hide_poly", mesh->totpoly);
bool *hide_poly = static_cast<bool *>(CustomData_get_layer_named_for_write(
&mesh->pdata, CD_PROP_BOOL, ".hide_poly", mesh->totpoly));
if (!hide_poly) {
if (!value) {
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element. */
return;
}
hide_poly = (bool *)CustomData_add_layer_named(
&mesh->pdata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totpoly, ".hide_poly");
hide_poly = static_cast<bool *>(CustomData_add_layer_named(
&mesh->pdata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totpoly, ".hide_poly"));
}
const int index = rna_MeshPolygon_index_get(ptr);
hide_poly[index] = value;
@ -584,8 +583,8 @@ static void rna_MeshPolygon_hide_set(PointerRNA *ptr, bool value)
static bool rna_MeshPolygon_use_smooth_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const bool *sharp_faces = (const bool *)CustomData_get_layer_named(
&mesh->pdata, CD_PROP_BOOL, "sharp_face");
const bool *sharp_faces = static_cast<const bool *>(
CustomData_get_layer_named(&mesh->pdata, CD_PROP_BOOL, "sharp_face"));
const int index = rna_MeshPolygon_index_get(ptr);
return !(sharp_faces && sharp_faces[index]);
}
@ -593,15 +592,15 @@ static bool rna_MeshPolygon_use_smooth_get(PointerRNA *ptr)
static void rna_MeshPolygon_use_smooth_set(PointerRNA *ptr, bool value)
{
Mesh *mesh = rna_mesh(ptr);
bool *sharp_faces = (bool *)CustomData_get_layer_named_for_write(
&mesh->pdata, CD_PROP_BOOL, "sharp_face", mesh->totpoly);
bool *sharp_faces = static_cast<bool *>(CustomData_get_layer_named_for_write(
&mesh->pdata, CD_PROP_BOOL, "sharp_face", mesh->totpoly));
if (!sharp_faces) {
if (value) {
/* Skip adding layer if the value is the same as the default. */
return;
}
sharp_faces = (bool *)CustomData_add_layer_named(
&mesh->pdata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totpoly, "sharp_face");
sharp_faces = static_cast<bool *>(CustomData_add_layer_named(
&mesh->pdata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totpoly, "sharp_face"));
}
const int index = rna_MeshPolygon_index_get(ptr);
sharp_faces[index] = !value;
@ -610,8 +609,8 @@ static void rna_MeshPolygon_use_smooth_set(PointerRNA *ptr, bool value)
static bool rna_MeshPolygon_select_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const bool *select_poly = (const bool *)CustomData_get_layer_named(
&mesh->pdata, CD_PROP_BOOL, ".select_poly");
const bool *select_poly = static_cast<const bool *>(
CustomData_get_layer_named(&mesh->pdata, CD_PROP_BOOL, ".select_poly"));
const int index = rna_MeshPolygon_index_get(ptr);
return select_poly == nullptr ? false : select_poly[index];
}
@ -619,15 +618,15 @@ static bool rna_MeshPolygon_select_get(PointerRNA *ptr)
static void rna_MeshPolygon_select_set(PointerRNA *ptr, bool value)
{
Mesh *mesh = rna_mesh(ptr);
bool *select_poly = (bool *)CustomData_get_layer_named_for_write(
&mesh->pdata, CD_PROP_BOOL, ".select_poly", mesh->totpoly);
bool *select_poly = static_cast<bool *>(CustomData_get_layer_named_for_write(
&mesh->pdata, CD_PROP_BOOL, ".select_poly", mesh->totpoly));
if (!select_poly) {
if (!value) {
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element. */
return;
}
select_poly = (bool *)CustomData_add_layer_named(
&mesh->pdata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totpoly, ".select_poly");
select_poly = static_cast<bool *>(CustomData_add_layer_named(
&mesh->pdata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totpoly, ".select_poly"));
}
const int index = rna_MeshPolygon_index_get(ptr);
select_poly[index] = value;
@ -789,8 +788,7 @@ static void rna_MeshVertex_groups_begin(CollectionPropertyIterator *iter, Pointe
const int index = rna_MeshVertex_index_get(ptr);
MDeformVert *dvert = &dverts[index];
rna_iterator_array_begin(
iter, (void *)dvert->dw, sizeof(MDeformWeight), dvert->totweight, 0, nullptr);
rna_iterator_array_begin(iter, dvert->dw, sizeof(MDeformWeight), dvert->totweight, 0, nullptr);
}
else {
rna_iterator_array_begin(iter, nullptr, 0, 0, 0, nullptr);
@ -1275,7 +1273,7 @@ static int rna_MeshPaintMaskLayer_data_length(PointerRNA *ptr)
static int rna_MeshPoly_vertices_get_length(const PointerRNA *ptr,
int length[RNA_MAX_ARRAY_DIMENSION])
{
const int *poly_offset_p = (const int *)ptr->data;
const int *poly_offset_p = static_cast<const int *>(ptr->data);
const int poly_start = *poly_offset_p;
const int poly_size = *(poly_offset_p + 1) - poly_start;
/* NOTE: raw access uses dummy item, this _could_ crash,
@ -1286,7 +1284,7 @@ static int rna_MeshPoly_vertices_get_length(const PointerRNA *ptr,
static void rna_MeshPoly_vertices_get(PointerRNA *ptr, int *values)
{
const Mesh *me = rna_mesh(ptr);
const int *poly_offset_p = (const int *)ptr->data;
const int *poly_offset_p = static_cast<const int *>(ptr->data);
const int poly_start = *poly_offset_p;
const int poly_size = *(poly_offset_p + 1) - poly_start;
memcpy(values, &me->corner_verts()[poly_start], sizeof(int) * poly_size);
@ -1294,24 +1292,24 @@ static void rna_MeshPoly_vertices_get(PointerRNA *ptr, int *values)
static int rna_MeshPolygon_loop_start_get(PointerRNA *ptr)
{
return *(const int *)ptr->data;
return *static_cast<const int *>(ptr->data);
}
static void rna_MeshPolygon_loop_start_set(PointerRNA *ptr, int value)
{
*(int *)ptr->data = value;
*static_cast<int *>(ptr->data) = value;
}
static int rna_MeshPolygon_loop_total_get(PointerRNA *ptr)
{
const int *data = (const int *)ptr->data;
const int *data = static_cast<const int *>(ptr->data);
return *(data + 1) - *data;
}
static void rna_MeshPoly_vertices_set(PointerRNA *ptr, const int *values)
{
Mesh *me = rna_mesh(ptr);
const int *poly_offset_p = (const int *)ptr->data;
const int *poly_offset_p = static_cast<const int *>(ptr->data);
const int poly_start = *poly_offset_p;
const int poly_size = *(poly_offset_p + 1) - poly_start;
memcpy(&me->corner_verts_for_write()[poly_start], values, sizeof(int) * poly_size);
@ -1331,8 +1329,8 @@ static void rna_MeshPoly_material_index_range(
static bool rna_MeshEdge_hide_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const bool *hide_edge = (const bool *)CustomData_get_layer_named(
&mesh->edata, CD_PROP_BOOL, ".hide_edge");
const bool *hide_edge = static_cast<const bool *>(
CustomData_get_layer_named(&mesh->edata, CD_PROP_BOOL, ".hide_edge"));
const int index = rna_MeshEdge_index_get(ptr);
return hide_edge == nullptr ? false : hide_edge[index];
}
@ -1340,15 +1338,15 @@ static bool rna_MeshEdge_hide_get(PointerRNA *ptr)
static void rna_MeshEdge_hide_set(PointerRNA *ptr, bool value)
{
Mesh *mesh = rna_mesh(ptr);
bool *hide_edge = (bool *)CustomData_get_layer_named_for_write(
&mesh->edata, CD_PROP_BOOL, ".hide_edge", mesh->totedge);
bool *hide_edge = static_cast<bool *>(CustomData_get_layer_named_for_write(
&mesh->edata, CD_PROP_BOOL, ".hide_edge", mesh->totedge));
if (!hide_edge) {
if (!value) {
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element. */
return;
}
hide_edge = (bool *)CustomData_add_layer_named(
&mesh->edata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totedge, ".hide_edge");
hide_edge = static_cast<bool *>(CustomData_add_layer_named(
&mesh->edata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totedge, ".hide_edge"));
}
const int index = rna_MeshEdge_index_get(ptr);
hide_edge[index] = value;
@ -1357,8 +1355,8 @@ static void rna_MeshEdge_hide_set(PointerRNA *ptr, bool value)
static bool rna_MeshEdge_select_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const bool *select_edge = (const bool *)CustomData_get_layer_named(
&mesh->edata, CD_PROP_BOOL, ".select_edge");
const bool *select_edge = static_cast<const bool *>(
CustomData_get_layer_named(&mesh->edata, CD_PROP_BOOL, ".select_edge"));
const int index = rna_MeshEdge_index_get(ptr);
return select_edge == nullptr ? false : select_edge[index];
}
@ -1366,15 +1364,15 @@ static bool rna_MeshEdge_select_get(PointerRNA *ptr)
static void rna_MeshEdge_select_set(PointerRNA *ptr, bool value)
{
Mesh *mesh = rna_mesh(ptr);
bool *select_edge = (bool *)CustomData_get_layer_named_for_write(
&mesh->edata, CD_PROP_BOOL, ".select_edge", mesh->totedge);
bool *select_edge = static_cast<bool *>(CustomData_get_layer_named_for_write(
&mesh->edata, CD_PROP_BOOL, ".select_edge", mesh->totedge));
if (!select_edge) {
if (!value) {
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element. */
return;
}
select_edge = (bool *)CustomData_add_layer_named(
&mesh->edata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totedge, ".select_edge");
select_edge = static_cast<bool *>(CustomData_add_layer_named(
&mesh->edata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totedge, ".select_edge"));
}
const int index = rna_MeshEdge_index_get(ptr);
select_edge[index] = value;
@ -1383,8 +1381,8 @@ static void rna_MeshEdge_select_set(PointerRNA *ptr, bool value)
static bool rna_MeshEdge_use_edge_sharp_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const bool *sharp_edge = (const bool *)CustomData_get_layer_named(
&mesh->edata, CD_PROP_BOOL, "sharp_edge");
const bool *sharp_edge = static_cast<const bool *>(
CustomData_get_layer_named(&mesh->edata, CD_PROP_BOOL, "sharp_edge"));
const int index = rna_MeshEdge_index_get(ptr);
return sharp_edge == nullptr ? false : sharp_edge[index];
}
@ -1392,15 +1390,15 @@ static bool rna_MeshEdge_use_edge_sharp_get(PointerRNA *ptr)
static void rna_MeshEdge_use_edge_sharp_set(PointerRNA *ptr, bool value)
{
Mesh *mesh = rna_mesh(ptr);
bool *sharp_edge = (bool *)CustomData_get_layer_named_for_write(
&mesh->edata, CD_PROP_BOOL, "sharp_edge", mesh->totedge);
bool *sharp_edge = static_cast<bool *>(CustomData_get_layer_named_for_write(
&mesh->edata, CD_PROP_BOOL, "sharp_edge", mesh->totedge));
if (!sharp_edge) {
if (!value) {
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element. */
return;
}
sharp_edge = (bool *)CustomData_add_layer_named(
&mesh->edata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totedge, "sharp_edge");
sharp_edge = static_cast<bool *>(CustomData_add_layer_named(
&mesh->edata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totedge, "sharp_edge"));
}
const int index = rna_MeshEdge_index_get(ptr);
sharp_edge[index] = value;
@ -1409,8 +1407,8 @@ static void rna_MeshEdge_use_edge_sharp_set(PointerRNA *ptr, bool value)
static bool rna_MeshEdge_use_seam_get(PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const bool *seam_edge = (const bool *)CustomData_get_layer_named(
&mesh->edata, CD_PROP_BOOL, ".uv_seam");
const bool *seam_edge = static_cast<const bool *>(
CustomData_get_layer_named(&mesh->edata, CD_PROP_BOOL, ".uv_seam"));
const int index = rna_MeshEdge_index_get(ptr);
return seam_edge == nullptr ? false : seam_edge[index];
}
@ -1418,15 +1416,15 @@ static bool rna_MeshEdge_use_seam_get(PointerRNA *ptr)
static void rna_MeshEdge_use_seam_set(PointerRNA *ptr, bool value)
{
Mesh *mesh = rna_mesh(ptr);
bool *seam_edge = (bool *)CustomData_get_layer_named_for_write(
&mesh->edata, CD_PROP_BOOL, ".uv_seam", mesh->totedge);
bool *seam_edge = static_cast<bool *>(
CustomData_get_layer_named_for_write(&mesh->edata, CD_PROP_BOOL, ".uv_seam", mesh->totedge));
if (!seam_edge) {
if (!value) {
/* Skip adding layer if it doesn't exist already anyway and we're not hiding an element. */
return;
}
seam_edge = (bool *)CustomData_add_layer_named(
&mesh->edata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totedge, ".uv_seam");
seam_edge = static_cast<bool *>(CustomData_add_layer_named(
&mesh->edata, CD_PROP_BOOL, CD_SET_DEFAULT, mesh->totedge, ".uv_seam"));
}
const int index = rna_MeshEdge_index_get(ptr);
seam_edge[index] = value;
@ -1452,8 +1450,8 @@ static bool rna_MeshLoopTriangle_use_smooth_get(PointerRNA *ptr)
{
const Mesh *me = rna_mesh(ptr);
const int poly_i = rna_MeshLoopTriangle_polygon_index_get(ptr);
const bool *sharp_faces = (const bool *)CustomData_get_layer_named(
&me->pdata, CD_PROP_BOOL, "sharp_face");
const bool *sharp_faces = static_cast<const bool *>(
CustomData_get_layer_named(&me->pdata, CD_PROP_BOOL, "sharp_face"));
return !(sharp_faces && sharp_faces[poly_i]);
}
@ -1479,29 +1477,28 @@ static char *rna_VertexGroupElement_path(const PointerRNA *ptr)
static char *rna_MeshPolygon_path(const PointerRNA *ptr)
{
return BLI_sprintfN("polygons[%d]", rna_MeshPolygon_index_get((PointerRNA *)ptr));
return BLI_sprintfN("polygons[%d]", rna_MeshPolygon_index_get(const_cast<PointerRNA *>(ptr)));
}
static char *rna_MeshLoopTriangle_path(const PointerRNA *ptr)
{
return BLI_sprintfN(
"loop_triangles[%d]",
(int)((MLoopTri *)ptr->data - BKE_mesh_runtime_looptri_ensure(rna_mesh(ptr))));
const int index = rna_MeshLoopTriangle_index_get(const_cast<PointerRNA *>(ptr));
return BLI_sprintfN("loop_triangles[%d]", index);
}
static char *rna_MeshEdge_path(const PointerRNA *ptr)
{
return BLI_sprintfN("edges[%d]", rna_MeshEdge_index_get((PointerRNA *)ptr));
return BLI_sprintfN("edges[%d]", rna_MeshEdge_index_get(const_cast<PointerRNA *>(ptr)));
}
static char *rna_MeshLoop_path(const PointerRNA *ptr)
{
return BLI_sprintfN("loops[%d]", rna_MeshLoop_index_get((PointerRNA *)ptr));
return BLI_sprintfN("loops[%d]", rna_MeshLoop_index_get(const_cast<PointerRNA *>(ptr)));
}
static char *rna_MeshVertex_path(const PointerRNA *ptr)
{
return BLI_sprintfN("vertices[%d]", rna_MeshVertex_index_get((PointerRNA *)ptr));
return BLI_sprintfN("vertices[%d]", rna_MeshVertex_index_get(const_cast<PointerRNA *>(ptr)));
}
static char *rna_VertCustomData_data_path(const PointerRNA *ptr, const char *collection, int type)
@ -1577,9 +1574,9 @@ static void rna_Mesh_edges_begin(CollectionPropertyIterator *iter, PointerRNA *p
{
using namespace blender;
Mesh *mesh = rna_mesh(ptr);
int2 *edges = static_cast<int2 *>(CustomData_get_layer_named_for_write(
blender::int2 *edges = static_cast<blender::int2 *>(CustomData_get_layer_named_for_write(
&mesh->edata, CD_PROP_INT32_2D, ".edge_verts", mesh->totedge));
rna_iterator_array_begin(iter, edges, sizeof(int2), mesh->totedge, false, nullptr);
rna_iterator_array_begin(iter, edges, sizeof(blender::int2), mesh->totedge, false, nullptr);
}
static int rna_Mesh_edges_length(PointerRNA *ptr)
{
@ -1593,7 +1590,7 @@ int rna_Mesh_edges_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
if (index < 0 || index >= mesh->totedge) {
return false;
}
int2 *edges = static_cast<int2 *>(CustomData_get_layer_named_for_write(
blender::int2 *edges = static_cast<blender::int2 *>(CustomData_get_layer_named_for_write(
&mesh->edata, CD_PROP_INT32_2D, ".edge_verts", mesh->totedge));
r_ptr->owner_id = &mesh->id;
r_ptr->type = &RNA_MeshEdge;
@ -1651,8 +1648,12 @@ static void rna_Mesh_vertex_normals_begin(CollectionPropertyIterator *iter, Poin
{
const Mesh *mesh = rna_mesh(ptr);
const blender::Span<blender::float3> normals = mesh->vert_normals();
rna_iterator_array_begin(
iter, (void *)normals.data(), sizeof(blender::float3), mesh->totvert, false, nullptr);
rna_iterator_array_begin(iter,
const_cast<blender::float3 *>(normals.data()),
sizeof(blender::float3),
normals.size(),
false,
nullptr);
}
static int rna_Mesh_vertex_normals_length(PointerRNA *ptr)
@ -1670,7 +1671,7 @@ int rna_Mesh_vertex_normals_lookup_int(PointerRNA *ptr, int index, PointerRNA *r
/* Casting away const is okay because this RNA type doesn't allow changing the value. */
r_ptr->owner_id = (ID *)&mesh->id;
r_ptr->type = &RNA_MeshNormalValue;
r_ptr->data = (float *)&mesh->vert_normals()[index];
r_ptr->data = const_cast<blender::float3 *>(&mesh->vert_normals()[index]);
return true;
}
@ -1678,8 +1679,12 @@ static void rna_Mesh_poly_normals_begin(CollectionPropertyIterator *iter, Pointe
{
const Mesh *mesh = rna_mesh(ptr);
const blender::Span<blender::float3> normals = mesh->poly_normals();
rna_iterator_array_begin(
iter, (void *)normals.data(), sizeof(blender::float3), mesh->totpoly, false, nullptr);
rna_iterator_array_begin(iter,
const_cast<blender::float3 *>(normals.data()),
sizeof(blender::float3),
normals.size(),
false,
nullptr);
}
static int rna_Mesh_poly_normals_length(PointerRNA *ptr)
@ -1697,20 +1702,25 @@ int rna_Mesh_poly_normals_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_p
/* Casting away const is okay because this RNA type doesn't allow changing the value. */
r_ptr->owner_id = (ID *)&mesh->id;
r_ptr->type = &RNA_MeshNormalValue;
r_ptr->data = (float *)&mesh->poly_normals()[index];
r_ptr->data = const_cast<blender::float3 *>(&mesh->poly_normals()[index]);
return true;
}
static void rna_Mesh_corner_normals_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const float(*normals)[3] = static_cast<const float(*)[3]>(
const blender::float3 *normals = static_cast<const blender::float3 *>(
CustomData_get_layer(&mesh->ldata, CD_NORMAL));
if (!normals) {
iter->valid = false;
return;
}
rna_iterator_array_begin(iter, (void *)normals, sizeof(float[3]), mesh->totloop, false, nullptr);
rna_iterator_array_begin(iter,
const_cast<blender::float3 *>(normals),
sizeof(float[3]),
mesh->totloop,
false,
nullptr);
}
static int rna_Mesh_corner_normals_length(PointerRNA *ptr)
@ -1725,7 +1735,7 @@ static int rna_Mesh_corner_normals_length(PointerRNA *ptr)
int rna_Mesh_corner_normals_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const float(*normals)[3] = static_cast<const float(*)[3]>(
const blender::float3 *normals = static_cast<const blender::float3 *>(
CustomData_get_layer(&mesh->ldata, CD_NORMAL));
if (index < 0 || index >= mesh->totloop || !normals) {
return false;
@ -1733,7 +1743,7 @@ int rna_Mesh_corner_normals_lookup_int(PointerRNA *ptr, int index, PointerRNA *r
/* Casting away const is okay because this RNA type doesn't allow changing the value. */
r_ptr->owner_id = (ID *)&mesh->id;
r_ptr->type = &RNA_MeshNormalValue;
r_ptr->data = (float *)normals[index];
r_ptr->data = const_cast<blender::float3 *>(&normals[index]);
return true;
}
@ -1754,13 +1764,13 @@ static bool get_uv_index_and_layer(const PointerRNA *ptr,
int *r_index_in_attribute)
{
const Mesh *mesh = rna_mesh(ptr);
const float(*uv_coord)[2] = (const float(*)[2])ptr->data;
const blender::float2 *uv_coord = static_cast<const blender::float2 *>(ptr->data);
/* We don't know from which attribute the RNA pointer is from, so we need to scan them all. */
const int uv_layers_num = CustomData_number_of_layers(&mesh->ldata, CD_PROP_FLOAT2);
for (int layer_i = 0; layer_i < uv_layers_num; layer_i++) {
const float(*layer_data)[2] = (const float(*)[2])CustomData_get_layer_n(
&mesh->ldata, CD_PROP_FLOAT2, layer_i);
const blender::float2 *layer_data = static_cast<const blender::float2 *>(
CustomData_get_layer_n(&mesh->ldata, CD_PROP_FLOAT2, layer_i));
const ptrdiff_t index = uv_coord - layer_data;
if (index >= 0 && index < mesh->totloop) {
*r_uv_map_index = layer_i;

2
source/blender/makesrna/intern/rna_mesh_api.cc
View File

@ -89,7 +89,7 @@ static void rna_Mesh_free_tangents(Mesh *mesh)
static void rna_Mesh_calc_looptri(Mesh *mesh)
{
BKE_mesh_runtime_looptri_ensure(mesh);
mesh->looptris();
}
static void rna_Mesh_calc_smooth_groups(