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

index-of-nearest-104619 #2

Merged
Iliya Katushenock merged 62 commits from HooglyBoogly/blender:index-of-nearest-104619 into index_of_nearest 2023-04-20 21:19:53 +02:00
Conversation 0 Commits 62 Files Changed 226 +5 -9
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b647c2b88d - Show all commits

2
source/blender/editors/sculpt_paint/sculpt_boundary.cc
View File

@ -7,7 +7,6 @@
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "BLI_edgehash.h"
#include "BLI_math.h" #include "BLI_math.h"
#include "BLI_task.h" #include "BLI_task.h"
@ -199,7 +198,6 @@ static bool sculpt_boundary_is_vertex_in_editable_boundary(SculptSession *ss,
struct BoundaryFloodFillData { struct BoundaryFloodFillData {
SculptBoundary *boundary; SculptBoundary *boundary;
GSet *included_verts; GSet *included_verts;
EdgeSet *preview_edges;
PBVHVertRef last_visited_vertex; PBVHVertRef last_visited_vertex;
}; };

12
source/blender/io/collada/MeshImporter.h
View File

@ -83,7 +83,7 @@ class MeshImporter : public MeshImporterBase {
struct Primitive { struct Primitive {
int poly_index; int poly_index;
int *material_indices; int *material_indices;
unsigned int totpoly; uint totpoly;
}; };
typedef std::map<COLLADAFW::MaterialId, std::vector<Primitive>> MaterialIdPrimitiveArrayMap; typedef std::map<COLLADAFW::MaterialId, std::vector<Primitive>> MaterialIdPrimitiveArrayMap;
/* crazy name! */ /* crazy name! */
@ -94,7 +94,7 @@ class MeshImporter : public MeshImporterBase {
bool set_poly_indices(int *poly_verts, bool set_poly_indices(int *poly_verts,
int loop_index, int loop_index,
const unsigned int *indices, const uint *indices,
int loop_count); int loop_count);
void set_face_uv(blender::float2 *mloopuv, void set_face_uv(blender::float2 *mloopuv,
@ -140,9 +140,7 @@ class MeshImporter : public MeshImporterBase {
*/ */
static void mesh_add_edges(Mesh *mesh, int len); static void mesh_add_edges(Mesh *mesh, int len);
unsigned int get_loose_edge_count(COLLADAFW::Mesh *mesh); uint get_loose_edge_count(COLLADAFW::Mesh *mesh);
CustomData create_edge_custom_data(EdgeHash *eh);
/** /**
* Return the number of faces by summing up * Return the number of faces by summing up
@ -168,11 +166,11 @@ class MeshImporter : public MeshImporterBase {
* So this function MUST be called after read_faces() (see below) * So this function MUST be called after read_faces() (see below)
*/ */
void read_lines(COLLADAFW::Mesh *mesh, Mesh *me); void read_lines(COLLADAFW::Mesh *mesh, Mesh *me);
unsigned int get_vertex_count(COLLADAFW::Polygons *mp, int index); uint get_vertex_count(COLLADAFW::Polygons *mp, int index);
void get_vector(float v[3], COLLADAFW::MeshVertexData &arr, int i, int stride); void get_vector(float v[3], COLLADAFW::MeshVertexData &arr, int i, int stride);
bool is_flat_face(unsigned int *nind, COLLADAFW::MeshVertexData &nor, int count); bool is_flat_face(uint *nind, COLLADAFW::MeshVertexData &nor, int count);
/** /**
* Returns the list of Users of the given Mesh object. * Returns the list of Users of the given Mesh object.