[Bf-blender-cvs] [7a0e8e1eb7e] temp-vert-normals-cleanup: Merge branch 'master' into temp-vert-normals-cleanup
Hans Goudey
noreply at git.blender.org
Tue Jan 11 06:24:10 CET 2022
Commit: 7a0e8e1eb7eeec89051701e677fe9b5d7c6b2dea
Author: Hans Goudey
Date: Mon Jan 10 23:23:56 2022 -0600
Branches: temp-vert-normals-cleanup
https://developer.blender.org/rB7a0e8e1eb7eeec89051701e677fe9b5d7c6b2dea
Merge branch 'master' into temp-vert-normals-cleanup
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_mesh.h
index 68d04778efa,5f3fcb535b2..1ba3d0c0b47
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@@ -615,45 -544,42 +613,45 @@@ void BKE_lnor_space_custom_normal_to_da
* (splitting edges).
*/
void BKE_mesh_normals_loop_split(const struct MVert *mverts,
+ const float (*vert_normals)[3],
- const int numVerts,
+ int numVerts,
struct MEdge *medges,
- const int numEdges,
+ int numEdges,
struct MLoop *mloops,
float (*r_loopnors)[3],
- const int numLoops,
+ int numLoops,
struct MPoly *mpolys,
const float (*polynors)[3],
- const int numPolys,
- const bool use_split_normals,
- const float split_angle,
+ int numPolys,
+ bool use_split_normals,
+ float split_angle,
MLoopNorSpaceArray *r_lnors_spacearr,
short (*clnors_data)[2],
int *r_loop_to_poly);
void BKE_mesh_normals_loop_custom_set(const struct MVert *mverts,
+ const float (*vert_normals)[3],
- const int numVerts,
+ int numVerts,
struct MEdge *medges,
- const int numEdges,
+ int numEdges,
struct MLoop *mloops,
float (*r_custom_loopnors)[3],
- const int numLoops,
+ int numLoops,
struct MPoly *mpolys,
const float (*polynors)[3],
- const int numPolys,
+ int numPolys,
short (*r_clnors_data)[2]);
void BKE_mesh_normals_loop_custom_from_vertices_set(const struct MVert *mverts,
+ const float (*vert_normals)[3],
float (*r_custom_vertnors)[3],
- const int numVerts,
+ int numVerts,
struct MEdge *medges,
- const int numEdges,
+ int numEdges,
struct MLoop *mloops,
- const int numLoops,
+ int numLoops,
struct MPoly *mpolys,
const float (*polynors)[3],
- const int numPolys,
+ int numPolys,
short (*r_clnors_data)[2]);
/**
diff --cc source/blender/blenkernel/BKE_mesh_remap.h
index 24bca006b1f,84abeac0d13..ab07cb0df4e
--- a/source/blender/blenkernel/BKE_mesh_remap.h
+++ b/source/blender/blenkernel/BKE_mesh_remap.h
@@@ -206,37 -206,40 +206,37 @@@ void BKE_mesh_remap_calc_edges_from_mes
struct Mesh *me_src,
MeshPairRemap *r_map);
- void BKE_mesh_remap_calc_loops_from_mesh(const int mode,
+ void BKE_mesh_remap_calc_loops_from_mesh(int mode,
const struct SpaceTransform *space_transform,
- const float max_dist,
- const float ray_radius,
+ float max_dist,
+ float ray_radius,
+ struct Mesh *mesh_dst,
struct MVert *verts_dst,
- const int numverts_dst,
+ int numverts_dst,
struct MEdge *edges_dst,
- const int numedges_dst,
+ int numedges_dst,
struct MLoop *loops_dst,
- const int numloops_dst,
+ int numloops_dst,
struct MPoly *polys_dst,
- const int numpolys_dst,
+ int numpolys_dst,
struct CustomData *ldata_dst,
- const bool use_split_nors_dst,
- const float split_angle_dst,
- const bool dirty_nors_dst,
- struct CustomData *pdata_dst,
+ bool use_split_nors_dst,
+ float split_angle_dst,
+ bool dirty_nors_dst,
struct Mesh *me_src,
MeshRemapIslandsCalc gen_islands_src,
- const float islands_precision_src,
+ float islands_precision_src,
struct MeshPairRemap *r_map);
- void BKE_mesh_remap_calc_polys_from_mesh(const int mode,
+ void BKE_mesh_remap_calc_polys_from_mesh(int mode,
const struct SpaceTransform *space_transform,
- const float max_dist,
- const float ray_radius,
+ float max_dist,
+ float ray_radius,
+ struct Mesh *mesh_dst,
struct MVert *verts_dst,
- int numverts_dst,
struct MLoop *loops_dst,
- int numloops_dst,
struct MPoly *polys_dst,
- const int numpolys_dst,
+ int numpolys_dst,
- struct CustomData *pdata_dst,
- bool dirty_nors_dst,
struct Mesh *me_src,
struct MeshPairRemap *r_map);
diff --cc source/blender/blenkernel/BKE_subdiv_eval.h
index 6e8d62602b6,052d25693c4..eeb80898148
--- a/source/blender/blenkernel/BKE_subdiv_eval.h
+++ b/source/blender/blenkernel/BKE_subdiv_eval.h
@@@ -73,12 -73,10 +73,8 @@@ void BKE_subdiv_eval_limit_point_and_de
float r_P[3],
float r_dPdu[3],
float r_dPdv[3]);
- void BKE_subdiv_eval_limit_point_and_normal(struct Subdiv *subdiv,
- const int ptex_face_index,
- const float u,
- const float v,
- float r_P[3],
- float r_N[3]);
+ void BKE_subdiv_eval_limit_point_and_normal(
+ struct Subdiv *subdiv, int ptex_face_index, float u, float v, float r_P[3], float r_N[3]);
-void BKE_subdiv_eval_limit_point_and_short_normal(
- struct Subdiv *subdiv, int ptex_face_index, float u, float v, float r_P[3], short r_N[3]);
/* Evaluate face-varying layer (such as UV). */
void BKE_subdiv_eval_face_varying(struct Subdiv *subdiv,
@@@ -113,32 -111,41 +109,32 @@@ void BKE_subdiv_eval_final_point
* goes as u in rows, v in columns. */
void BKE_subdiv_eval_limit_patch_resolution_point(struct Subdiv *subdiv,
- const int ptex_face_index,
- const int resolution,
+ int ptex_face_index,
+ int resolution,
void *buffer,
- const int offset,
- const int stride);
+ int offset,
+ int stride);
void BKE_subdiv_eval_limit_patch_resolution_point_and_derivatives(struct Subdiv *subdiv,
- const int ptex_face_index,
- const int resolution,
+ int ptex_face_index,
+ int resolution,
void *poi
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list