forked from bartvdbraak/blender
Cleanup: ws
This commit is contained in:
parent
f2620c9df1
commit
52fa5b12e1
@ -1682,10 +1682,11 @@ static void cdDM_buffer_copy_uvedge(DerivedMesh *dm, float *varray, int *UNUSED(
|
||||
}
|
||||
}
|
||||
|
||||
static void cdDM_copy_gpu_data(DerivedMesh *dm, int type, float *varray,
|
||||
int *mat_orig_to_new, void *user_data)
|
||||
static void cdDM_copy_gpu_data(
|
||||
DerivedMesh *dm, int type, float *varray,
|
||||
int *mat_orig_to_new, void *user_data)
|
||||
{
|
||||
switch(type) {
|
||||
switch (type) {
|
||||
case GPU_BUFFER_VERTEX:
|
||||
cdDM_buffer_copy_vertex(dm, varray, mat_orig_to_new, user_data);
|
||||
break;
|
||||
|
@ -192,7 +192,7 @@ static void mesh_calc_eigen_matrix(
|
||||
* doesn't handle casting correct we use workaround to avoid explicit
|
||||
* cast here.
|
||||
*/
|
||||
vcos = (void*)cos;
|
||||
vcos = (void *)cos;
|
||||
}
|
||||
unit_m4(r_mat);
|
||||
|
||||
@ -210,16 +210,16 @@ static void mesh_calc_eigen_matrix(
|
||||
|
||||
/* Special handling of cases where some eigen values are (nearly) identical. */
|
||||
if (compare_ff_relative(eigen_val[0], eigen_val[1], FLT_EPSILON, 64)) {
|
||||
if (compare_ff_relative(eigen_val[0], eigen_val[2], FLT_EPSILON, 64)) {
|
||||
if (compare_ff_relative(eigen_val[0], eigen_val[2], FLT_EPSILON, 64)) {
|
||||
/* No preferred direction, that set of vertices has a spherical average,
|
||||
* so we simply returned scaled/translated identity matrix (with no rotation). */
|
||||
* so we simply returned scaled/translated identity matrix (with no rotation). */
|
||||
unit_m3(eigen_vec);
|
||||
}
|
||||
else {
|
||||
/* Ellipsoid defined by eigen values/vectors has a spherical section,
|
||||
* we can only define one axis from eigen_vec[2] (two others computed eigen vecs
|
||||
* are not so nice for us here, they tend to 'randomly' rotate around valid one).
|
||||
* Note that eigen vectors as returned by BLI_eigen_solve_selfadjoint_m3() are normalized. */
|
||||
* Note that eigen vectors as returned by BLI_eigen_solve_selfadjoint_m3() are normalized. */
|
||||
ortho_basis_v3v3_v3(eigen_vec[0], eigen_vec[1], eigen_vec[2]);
|
||||
}
|
||||
}
|
||||
|
@ -2094,10 +2094,11 @@ static void ccgDM_buffer_copy_uv_texpaint(DerivedMesh *dm, float *varray, int *U
|
||||
MEM_freeN(mtface_base);
|
||||
}
|
||||
|
||||
static void ccgDM_copy_gpu_data(DerivedMesh *dm, int type, float *varray,
|
||||
int *mat_orig_to_new, void *user_data)
|
||||
static void ccgDM_copy_gpu_data(
|
||||
DerivedMesh *dm, int type, float *varray,
|
||||
int *mat_orig_to_new, void *user_data)
|
||||
{
|
||||
switch(type) {
|
||||
switch (type) {
|
||||
case GPU_BUFFER_VERTEX:
|
||||
ccgDM_buffer_copy_vertex(dm, varray, mat_orig_to_new, NULL);
|
||||
break;
|
||||
@ -2127,7 +2128,8 @@ typedef struct {
|
||||
int polys;
|
||||
} GPUMaterialInfo;
|
||||
|
||||
static GPUDrawObject *ccgDM_GPUObjectNew(DerivedMesh *dm) {
|
||||
static GPUDrawObject *ccgDM_GPUObjectNew(DerivedMesh *dm)
|
||||
{
|
||||
GPUBufferMaterial *mat;
|
||||
int *mat_orig_to_new;
|
||||
CCGDerivedMesh *ccgdm = (CCGDerivedMesh *) dm;
|
||||
|
@ -284,7 +284,7 @@ static void knife_update_header(bContext *C, wmOperator *op, KnifeTool_OpData *k
|
||||
WM_MODALKEY(KNF_MODAL_MIDPOINT_ON), WM_bool_as_string(kcd->snap_midpoints),
|
||||
WM_MODALKEY(KNF_MODEL_IGNORE_SNAP_ON), WM_bool_as_string(kcd->ignore_edge_snapping),
|
||||
WM_MODALKEY(KNF_MODAL_ANGLE_SNAP_TOGGLE), WM_bool_as_string(kcd->angle_snapping),
|
||||
WM_MODALKEY(KNF_MODAL_CUT_THROUGH_TOGGLE),WM_bool_as_string(kcd->cut_through),
|
||||
WM_MODALKEY(KNF_MODAL_CUT_THROUGH_TOGGLE), WM_bool_as_string(kcd->cut_through),
|
||||
WM_MODALKEY(KNF_MODAL_PANNING));
|
||||
|
||||
#undef WM_MODALKEY
|
||||
|
@ -961,7 +961,7 @@ static void rna_def_linestyle_modifiers(BlenderRNA *brna)
|
||||
|
||||
srna = RNA_def_struct(brna, "LineStyleAlphaModifier_Curvature_3D", "LineStyleAlphaModifier");
|
||||
RNA_def_struct_ui_text(srna, "Curvature 3D",
|
||||
"Alpha transparency based on the radial curvature of 3D mesh surfaces");
|
||||
"Alpha transparency based on the radial curvature of 3D mesh surfaces");
|
||||
rna_def_alpha_modifier(srna);
|
||||
rna_def_modifier_curve_common(srna, false, false);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user