Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/editors/mesh
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r--source/blender/editors/mesh/editface.c2
-rw-r--r--source/blender/editors/mesh/editmesh_lib.c10
-rw-r--r--source/blender/editors/mesh/editmesh_loop.c10
-rw-r--r--source/blender/editors/mesh/editmesh_mods.c10
-rw-r--r--source/blender/editors/mesh/editmesh_tools.c38
-rw-r--r--source/blender/editors/mesh/mesh_data.c6
-rw-r--r--source/blender/editors/mesh/meshtools.c2
7 files changed, 39 insertions, 39 deletions
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index e83be1f4f1d..123b7361251 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -744,7 +744,7 @@ void seam_mark_clear_tface(Scene *scene, short mode)
for (a=0, med=me->medge; a<me->totedge; a++, med++)
if (BLI_edgehash_haskey(ehash1, med->v1, med->v2) &&
- BLI_edgehash_haskey(ehash2, med->v1, med->v2))
+ BLI_edgehash_haskey(ehash2, med->v1, med->v2))
med->flag |= ME_SEAM;
BLI_edgehash_free(ehash1, NULL);
diff --git a/source/blender/editors/mesh/editmesh_lib.c b/source/blender/editors/mesh/editmesh_lib.c
index 06d9301072e..21b6b335f16 100644
--- a/source/blender/editors/mesh/editmesh_lib.c
+++ b/source/blender/editors/mesh/editmesh_lib.c
@@ -522,9 +522,9 @@ void EM_set_flag_all(EditMesh *em, int flag)
void EM_set_flag_all_selectmode(EditMesh *em, int flag)
{
- EditVert *eve;
- EditEdge *eed;
- EditFace *efa;
+ EditVert *eve;
+ EditEdge *eed;
+ EditFace *efa;
int selvert= 0, seledge= 0, selface= 0;
@@ -582,7 +582,7 @@ void EM_set_flag_all_selectmode(EditMesh *em, int flag)
em->totvertsel= selvert;
em->totedgesel= seledge;
em->totfacesel= selface;
- }
+ }
}
/* flush for changes in vertices only */
void EM_deselect_flush(EditMesh *em)
@@ -1655,7 +1655,7 @@ short extrudeflag_vert(Object *obedit, EditMesh *em, short flag, float *nor, int
/* if del_old==1 then extrude is in partial geometry, to keep it manifold.
verts with f1==0 and (eve->f & 128)==0) are removed
- edges with eed->f2>2 are removed
+ edges with eed->f2>2 are removed
faces with efa->f1 are removed
if del_old==0 the extrude creates a volume.
*/
diff --git a/source/blender/editors/mesh/editmesh_loop.c b/source/blender/editors/mesh/editmesh_loop.c
index f2a099ca6a5..0af330c1aac 100644
--- a/source/blender/editors/mesh/editmesh_loop.c
+++ b/source/blender/editors/mesh/editmesh_loop.c
@@ -231,7 +231,7 @@ void CutEdgeloop(Object *obedit, wmOperator *op, EditMesh *em, int numcuts)
// scrarea_do_windraw(curarea); // after findnearestedge, backbuf!
sprintf(msg,"Number of Cuts: %d (S)mooth: ",numcuts);
- strcat(msg, smooth ? "on":"off");
+ strcat(msg, smooth ? "on":"off");
// headerprint(msg);
/* Need to figure preview */
@@ -444,10 +444,10 @@ typedef struct CutCurve {
Contributed by Robert Wenzlaff (Det. Thorn).
- 2.5 revamp:
- - non modal (no menu before cutting)
- - exit on mouse release
- - polygon/segment drawing can become handled by WM cb later
+ 2.5 revamp:
+ - non modal (no menu before cutting)
+ - exit on mouse release
+ - polygon/segment drawing can become handled by WM cb later
*/
diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c
index d0201f1c6ab..4cd152cbd29 100644
--- a/source/blender/editors/mesh/editmesh_mods.c
+++ b/source/blender/editors/mesh/editmesh_mods.c
@@ -292,7 +292,7 @@ int EM_mask_init_backbuf_border(ViewContext *vc, short mcords[][2], short tot, s
/* yah, opengl doesn't do concave... tsk! */
ED_region_pixelspace(vc->ar);
- draw_triangulated(mcords, tot);
+ draw_triangulated(mcords, tot);
glBegin(GL_LINE_LOOP); /* for zero sized masks, lines */
for(a=0; a<tot; a++) glVertex2s(mcords[a][0], mcords[a][1]);
@@ -794,7 +794,7 @@ static int similar_face_select__internal(Scene *scene, EditMesh *em, int mode)
MTFace *tf, *base_tf;
base_tf = (MTFace*)CustomData_em_get(&em->fdata, base_efa->data,
- CD_MTFACE);
+ CD_MTFACE);
if(!base_tf)
return selcount;
@@ -802,7 +802,7 @@ static int similar_face_select__internal(Scene *scene, EditMesh *em, int mode)
for(efa= em->faces.first; efa; efa= efa->next) {
if (!(efa->f & SELECT) && !efa->h) {
tf = (MTFace*)CustomData_em_get(&em->fdata, efa->data,
- CD_MTFACE);
+ CD_MTFACE);
if(base_tf->tpage == tf->tpage) {
EM_select_face(efa, 1);
@@ -1318,7 +1318,7 @@ void MESH_OT_select_similar(wmOperatorType *ot)
int mesh_layers_menu_charlen(CustomData *data, int type)
{
- int i, len = 0;
+ int i, len = 0;
/* see if there is a duplicate */
for(i=0; i<data->totlayer; i++) {
if((&data->layers[i])->type == type) {
@@ -1972,7 +1972,7 @@ static void edgering_select(EditMesh *em, EditEdge *startedge, int select)
/* (de)select the edges */
for(eed= em->edges.first; eed; eed= eed->next) {
- if(eed->f2) EM_select_edge(eed, select);
+ if(eed->f2) EM_select_edge(eed, select);
}
}
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 2fa6acf8d00..be92a5e49ea 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -1599,16 +1599,16 @@ static void fill_quad_single(EditMesh *em, EditFace *efa, struct GHash *gh, int
hold = addfacelist(em, verts[i],verts[i+1],v[right],NULL,NULL,NULL);
facecopy(em, efa,hold);
if(i+1 != (vertsize-1)/2) {
- if(seltype == SUBDIV_SELECT_INNER) {
- hold->e2->f2 |= EDGEINNER;
- }
+ if(seltype == SUBDIV_SELECT_INNER) {
+ hold->e2->f2 |= EDGEINNER;
+ }
}
hold = addfacelist(em, verts[vertsize-2-i],verts[vertsize-1-i],v[left],NULL,NULL,NULL);
facecopy(em, efa,hold);
if(i+1 != (vertsize-1)/2) {
- if(seltype == SUBDIV_SELECT_INNER) {
- hold->e3->f2 |= EDGEINNER;
- }
+ if(seltype == SUBDIV_SELECT_INNER) {
+ hold->e3->f2 |= EDGEINNER;
+ }
}
}
}
@@ -1675,9 +1675,9 @@ static void fill_tri_single(EditMesh *em, EditFace *efa, struct GHash *gh, int n
for(i=0;i<(vertsize-1);i++) {
hold = addfacelist(em, verts[i],verts[i+1],v[op],NULL,NULL,NULL);
if(i+1 != vertsize-1) {
- if(seltype == SUBDIV_SELECT_INNER) {
- hold->e2->f2 |= EDGEINNER;
- }
+ if(seltype == SUBDIV_SELECT_INNER) {
+ hold->e2->f2 |= EDGEINNER;
+ }
}
facecopy(em, efa,hold);
}
@@ -2265,7 +2265,7 @@ static void fill_quad_quadruple(EditMesh *em, EditFace *efa, struct GHash *gh, i
0|---*---*---|0
| |
1* *1
- 2 | | 4
+ 2 | | 4
2* *2
| |
3|---*---*---|3
@@ -3587,7 +3587,7 @@ static void edge_rotate(EditMesh *em, wmOperator *op, EditEdge *eed, int dir)
return;
/* how many edges does each face have */
- if(face[0]->e4) fac1= 4;
+ if(face[0]->e4) fac1= 4;
else fac1= 3;
if(face[1]->e4) fac2= 4;
@@ -3641,11 +3641,11 @@ static void edge_rotate(EditMesh *em, wmOperator *op, EditEdge *eed, int dir)
hiddenedges = MEM_mallocN(sizeof(EditVert*)*numhidden+1, "RotateEdgeHiddenVerts");
if(!hiddenedges) {
- BKE_report(op->reports, RPT_ERROR, "Memory allocation failed");
- return;
- }
+ BKE_report(op->reports, RPT_ERROR, "Memory allocation failed");
+ return;
+ }
- numhidden = 0;
+ numhidden = 0;
for(srchedge=em->edges.first; srchedge; srchedge=srchedge->next)
if(srchedge->h && (srchedge->v1->f & SELECT || srchedge->v2->f & SELECT))
hiddenedges[numhidden++] = srchedge;
@@ -4609,7 +4609,7 @@ useless:
mvalo[0] = -1;
} else if(ELEM(event, RIGHTARROWKEY, WHEELUPMOUSE)) { // Scroll through Control Edges
look = vertlist;
- while(look) {
+ while(look) {
if(nearest == (EditVert*)look->link) {
if(look->next == NULL) {
nearest = (EditVert*)vertlist->link;
@@ -4623,7 +4623,7 @@ useless:
}
} else if(ELEM(event, LEFTARROWKEY, WHEELDOWNMOUSE)) { // Scroll through Control Edges
look = vertlist;
- while(look) {
+ while(look) {
if(look->next) {
if(look->next->link == nearest) {
nearest = (EditVert*)look->link;
@@ -4761,7 +4761,7 @@ void mesh_set_face_flags(EditMesh *em, short mode)
add_numbut(12, TOG|SHO, "Sort", 0, 0, &m_sort, NULL);
if (!do_clever_numbuts((mode ? "Set Flags" : "Clear Flags"), 13, REDRAW))
- return;
+ return;
/* these 2 cant both be on */
if (mode) /* are we seeting*/
@@ -5970,7 +5970,7 @@ static int select_vertex_path_exec(bContext *C, wmOperator *op)
PathNode *currpn;
PathNode *Q;
int v, *previous, pathvert, pnindex; /*pnindex redundant?*/
- int unbalanced, totnodes;
+ int unbalanced, totnodes;
short physical;
float *cost;
Heap *heap; /*binary heap for sorting pointers to PathNodes based upon a 'cost'*/
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c
index 2db229e8325..1819ab26282 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -202,7 +202,7 @@ int ED_mesh_uv_texture_remove(bContext *C, Object *ob, Mesh *me)
CustomDataLayer *cdl;
int index;
- index= CustomData_get_active_layer_index(data, CD_MTFACE);
+ index= CustomData_get_active_layer_index(data, CD_MTFACE);
cdl= (index == -1) ? NULL: &data->layers[index];
if(!cdl)
@@ -262,7 +262,7 @@ int ED_mesh_color_remove(bContext *C, Object *ob, Mesh *me)
CustomDataLayer *cdl;
int index;
- index= CustomData_get_active_layer_index(data, CD_MCOL);
+ index= CustomData_get_active_layer_index(data, CD_MCOL);
cdl= (index == -1)? NULL: &data->layers[index];
if(!cdl)
@@ -569,7 +569,7 @@ static void mesh_calc_edges(Mesh *mesh, int update)
ehi = BLI_edgehashIterator_new(eh);
med = CustomData_get_layer(&edata, CD_MEDGE);
for(i = 0; !BLI_edgehashIterator_isDone(ehi);
- BLI_edgehashIterator_step(ehi), ++i, ++med) {
+ BLI_edgehashIterator_step(ehi), ++i, ++med) {
if(update && (med_orig=BLI_edgehashIterator_getValue(ehi))) {
*med= *med_orig; /* copy from the original */
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index df67868d2ad..6ad88eefdd2 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -684,7 +684,7 @@ void sort_faces(Scene *scene, View3D *v3d)
/* sort index list instead of faces itself
and apply this permutation to all face layers */
- if (event == 5) {
+ if (event == 5) {
/* Random */
for(i=0; i<me->totface; i++) {
face_sort_floats[i] = BLI_frand();
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 00:17:33 +0300