forked from bartvdbraak/blender
style cleanup: braces/indentation
This commit is contained in:
parent
397da50002
commit
a2492e0603
@ -1816,7 +1816,7 @@ static int _axis_convert_lut[23][24] = {
|
|||||||
{0x408, 0x810, 0xA20, 0x228, 0x081, 0x891, 0x699, 0x2A9, 0x102, 0x50A,
|
{0x408, 0x810, 0xA20, 0x228, 0x081, 0x891, 0x699, 0x2A9, 0x102, 0x50A,
|
||||||
0x71A, 0xB22, 0x4CB, 0x8D3, 0xAE3, 0x2EB, 0x144, 0x954, 0x75C, 0x36C,
|
0x71A, 0xB22, 0x4CB, 0x8D3, 0xAE3, 0x2EB, 0x144, 0x954, 0x75C, 0x36C,
|
||||||
0x045, 0x44D, 0x65D, 0xA65},
|
0x045, 0x44D, 0x65D, 0xA65},
|
||||||
};
|
};
|
||||||
|
|
||||||
// _axis_convert_num = {'X': 0, 'Y': 1, 'Z': 2, '-X': 3, '-Y': 4, '-Z': 5}
|
// _axis_convert_num = {'X': 0, 'Y': 1, 'Z': 2, '-X': 3, '-Y': 4, '-Z': 5}
|
||||||
|
|
||||||
|
@ -217,7 +217,7 @@ void bmo_contextual_create_exec(BMesh *bm, BMOperator *op)
|
|||||||
/* Continue with ad-hoc fill methods since operators fail,
|
/* Continue with ad-hoc fill methods since operators fail,
|
||||||
* edge, vcloud... may add more */
|
* edge, vcloud... may add more */
|
||||||
|
|
||||||
if (0) { /* nice feature but perhaps it should be a different tool? */
|
if (0) { /* nice feature but perhaps it should be a different tool? */
|
||||||
|
|
||||||
/* tricky feature for making a line/edge from selection history...
|
/* tricky feature for making a line/edge from selection history...
|
||||||
*
|
*
|
||||||
|
@ -261,11 +261,14 @@ static void edgering_sel(RingSelOpData *lcd, int previewlines, bool select)
|
|||||||
eed_last = eed;
|
eed_last = eed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((eed_last != eed_start) &&
|
||||||
#ifdef BMW_EDGERING_NGON
|
#ifdef BMW_EDGERING_NGON
|
||||||
if (lasteed != startedge && BM_edge_share_face_check(lasteed, startedge)) {
|
BM_edge_share_face_check(eed_last, eed_start)
|
||||||
#else
|
#else
|
||||||
if (eed_last != eed_start && BM_edge_share_quad_check(eed_last, eed_start)) {
|
BM_edge_share_quad_check(eed_last, eed_start)
|
||||||
#endif
|
#endif
|
||||||
|
)
|
||||||
|
{
|
||||||
v[1][0] = v[0][0];
|
v[1][0] = v[0][0];
|
||||||
v[1][1] = v[0][1];
|
v[1][1] = v[0][1];
|
||||||
|
|
||||||
|
@ -927,10 +927,11 @@ static EnumPropertyItem *select_similar_type_itemf(bContext *C, PointerRNA *UNUS
|
|||||||
}
|
}
|
||||||
else if (em->selectmode & SCE_SELECT_FACE) {
|
else if (em->selectmode & SCE_SELECT_FACE) {
|
||||||
#ifdef WITH_FREESTYLE
|
#ifdef WITH_FREESTYLE
|
||||||
for (a = SIMFACE_MATERIAL; a <= SIMFACE_FREESTYLE; a++) {
|
const int a_end = SIMFACE_FREESTYLE;
|
||||||
#else
|
#else
|
||||||
for (a = SIMFACE_MATERIAL; a <= SIMFACE_COPLANAR; a++) {
|
const int a_end = SIMFACE_COPLANAR;
|
||||||
#endif
|
#endif
|
||||||
|
for (a = SIMFACE_MATERIAL; a <= a_end; a++) {
|
||||||
RNA_enum_items_add_value(&item, &totitem, prop_similar_types, a);
|
RNA_enum_items_add_value(&item, &totitem, prop_similar_types, a);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -576,8 +576,8 @@ bool paint_supports_dynamic_tex_coords(Brush *br, PaintMode mode)
|
|||||||
if (sculpt_is_grab_tool(br))
|
if (sculpt_is_grab_tool(br))
|
||||||
return false;
|
return false;
|
||||||
default:
|
default:
|
||||||
;
|
break;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -429,10 +429,9 @@ static ImBuf *avi_fetchibuf(struct anim *anim, int position)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
#else
|
|
||||||
if (1) {
|
|
||||||
#endif
|
#endif
|
||||||
|
{
|
||||||
ibuf = IMB_allocImBuf(anim->x, anim->y, 24, IB_rect);
|
ibuf = IMB_allocImBuf(anim->x, anim->y, 24, IB_rect);
|
||||||
|
|
||||||
tmp = AVI_read_frame(anim->avi, AVI_FORMAT_RGB32, position,
|
tmp = AVI_read_frame(anim->avi, AVI_FORMAT_RGB32, position,
|
||||||
|
@ -97,7 +97,8 @@ class Mem_IStream : public Imf::IStream
|
|||||||
public:
|
public:
|
||||||
|
|
||||||
Mem_IStream (unsigned char *exrbuf, size_t exrsize) :
|
Mem_IStream (unsigned char *exrbuf, size_t exrsize) :
|
||||||
IStream("dummy"), _exrpos(0), _exrsize(exrsize) {
|
IStream("dummy"), _exrpos(0), _exrsize(exrsize)
|
||||||
|
{
|
||||||
_exrbuf = exrbuf;
|
_exrbuf = exrbuf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ static bNodeSocketTemplate outputs[] = {
|
|||||||
{ SOCK_VECTOR, 0, "Velocity" },
|
{ SOCK_VECTOR, 0, "Velocity" },
|
||||||
{ SOCK_VECTOR, 0, "Angular Velocity" },
|
{ SOCK_VECTOR, 0, "Angular Velocity" },
|
||||||
{ -1, 0, "" }
|
{ -1, 0, "" }
|
||||||
};
|
};
|
||||||
|
|
||||||
/* node type definition */
|
/* node type definition */
|
||||||
void register_node_type_sh_particle_info(void)
|
void register_node_type_sh_particle_info(void)
|
||||||
|
@ -499,7 +499,7 @@ static PySequenceMethods bpy_bmdeformvert_as_sequence = {
|
|||||||
(objobjproc)bpy_bmdeformvert_contains, /* sq_contains */
|
(objobjproc)bpy_bmdeformvert_contains, /* sq_contains */
|
||||||
(binaryfunc) NULL, /* sq_inplace_concat */
|
(binaryfunc) NULL, /* sq_inplace_concat */
|
||||||
(ssizeargfunc) NULL, /* sq_inplace_repeat */
|
(ssizeargfunc) NULL, /* sq_inplace_repeat */
|
||||||
};
|
};
|
||||||
|
|
||||||
static PyMappingMethods bpy_bmdeformvert_as_mapping = {
|
static PyMappingMethods bpy_bmdeformvert_as_mapping = {
|
||||||
(lenfunc)bpy_bmdeformvert_len,
|
(lenfunc)bpy_bmdeformvert_len,
|
||||||
|
@ -135,7 +135,7 @@ enum {
|
|||||||
NDOF_BUTTON_C,
|
NDOF_BUTTON_C,
|
||||||
// the end
|
// the end
|
||||||
NDOF_LAST
|
NDOF_LAST
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/* SYSTEM : 0x01xx */
|
/* SYSTEM : 0x01xx */
|
||||||
|
Loading…
Reference in New Issue
Block a user