blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Cleanup: line wrapping caused by comments

This commit is contained in:
Campbell Barton 2019-04-17 18:50:53 +02:00
parent 81ce3801bf
commit 3fe6eebf20
9 changed files with 34 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/atomic/atomic_ops.h
View File

@ -113,8 +113,8 @@ ATOMIC_INLINE size_t atomic_sub_and_fetch_z(size_t *p, size_t x);
ATOMIC_INLINE size_t atomic_fetch_and_add_z(size_t *p, size_t x);
ATOMIC_INLINE size_t atomic_fetch_and_sub_z(size_t *p, size_t x);
ATOMIC_INLINE size_t atomic_cas_z(size_t *v, size_t old, size_t _new);
ATOMIC_INLINE size_t
atomic_fetch_and_update_max_z(size_t *p, size_t x); /* Uses CAS loop, see warning below. */
/* Uses CAS loop, see warning below. */
ATOMIC_INLINE size_t atomic_fetch_and_update_max_z(size_t *p, size_t x);
ATOMIC_INLINE unsigned int atomic_add_and_fetch_u(unsigned int *p, unsigned int x);
ATOMIC_INLINE unsigned int atomic_sub_and_fetch_u(unsigned int *p, unsigned int x);

8
source/blender/collada/AnimationExporter.cpp
View File

@ -752,10 +752,10 @@ const std::string AnimationExporter::get_collada_name(std::string channel_target
{"spot_size", "falloff_angle"},
{"fall_off_exponent", "falloff_exponent"},
{"spot_blend", "falloff_exponent"},
{"blender/blender_dist",
"blender/blender_dist"}, // special blender profile (todo: make this more elegant)
{"distance",
"blender/blender_dist"}, // special blender profile (todo: make this more elegant)
/* Special blender profile (todo: make this more elegant). */
{"blender/blender_dist", "blender/blender_dist"},
/* Special blender profile (todo: make this more elegant). */
{"distance", "blender/blender_dist"},
/* Cameras */
{"lens", "xfov"},

3
source/blender/editors/space_action/action_edit.c
View File

@ -680,7 +680,8 @@ void ACTION_OT_paste(wmOperatorType *ot)
static const EnumPropertyItem prop_actkeys_insertkey_types[] = {
{1, "ALL", 0, "All Channels", ""},
{2, "SEL", 0, "Only Selected Channels", ""},
{3, "GROUP", 0, "In Active Group", ""}, /* XXX not in all cases */
/* XXX not in all cases. */
{3, "GROUP", 0, "In Active Group", ""},
{0, NULL, 0, NULL, NULL},
};

7
source/blender/editors/space_nla/nla_edit.c
View File

@ -2125,11 +2125,8 @@ void NLA_OT_clear_scale(wmOperatorType *ot)
static const EnumPropertyItem prop_nlaedit_snap_types[] = {
{NLAEDIT_SNAP_CFRA, "CFRA", 0, "Current Frame", ""},
{NLAEDIT_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, "Nearest Frame", ""}, // XXX as single entry?
{NLAEDIT_SNAP_NEAREST_SECOND,
"NEAREST_SECOND",
0,
"Nearest Second",
""}, // XXX as single entry?
// XXX as single entry?
{NLAEDIT_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, "Nearest Second", ""},
{NLAEDIT_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, "Nearest Marker", ""},
{0, NULL, 0, NULL, NULL},
};

7
source/blender/makesrna/intern/rna_context.c
View File

@ -37,11 +37,8 @@ const EnumPropertyItem rna_enum_context_mode_items[] = {
{CTX_MODE_EDIT_CURVE, "EDIT_CURVE", 0, "Curve Edit", ""},
{CTX_MODE_EDIT_SURFACE, "EDIT_SURFACE", 0, "Surface Edit", ""},
{CTX_MODE_EDIT_TEXT, "EDIT_TEXT", 0, "Edit Edit", ""},
{CTX_MODE_EDIT_ARMATURE,
"EDIT_ARMATURE",
0,
"Armature Edit",
""}, /* PARSKEL reuse will give issues */
/* PARSKEL reuse will give issues */
{CTX_MODE_EDIT_ARMATURE, "EDIT_ARMATURE", 0, "Armature Edit", ""},
{CTX_MODE_EDIT_METABALL, "EDIT_METABALL", 0, "Metaball Edit", ""},
{CTX_MODE_EDIT_LATTICE, "EDIT_LATTICE", 0, "Lattice Edit", ""},
{CTX_MODE_POSE, "POSE", 0, "Pose ", ""},

3
source/blender/makesrna/intern/rna_curve.c
View File

@ -1781,7 +1781,8 @@ static void rna_def_curve_nurb(BlenderRNA *brna)
{KEY_LINEAR, "LINEAR", 0, "Linear", ""},
{KEY_CARDINAL, "CARDINAL", 0, "Cardinal", ""},
{KEY_BSPLINE, "BSPLINE", 0, "BSpline", ""},
{KEY_CU_EASE, "EASE", 0, "Ease", ""}, /* todo, define somewhere, not one of BEZT_IPO_* */
/* TODO: define somewhere, not one of BEZT_IPO_*. */
{KEY_CU_EASE, "EASE", 0, "Ease", ""},
{0, NULL, 0, NULL, NULL},
};

24
source/blender/makesrna/intern/rna_object.c
View File

@ -153,11 +153,8 @@ const EnumPropertyItem rna_enum_object_gpencil_type_items[] = {
static const EnumPropertyItem parent_type_items[] = {
{PAROBJECT, "OBJECT", 0, "Object", "The object is parented to an object"},
{PARSKEL, "ARMATURE", 0, "Armature", ""},
{PARSKEL,
"LATTICE",
0,
"Lattice",
"The object is parented to a lattice"}, /* PARSKEL reuse will give issues */
/* PARSKEL reuse will give issues. */
{PARSKEL, "LATTICE", 0, "Lattice", "The object is parented to a lattice"},
{PARVERT1, "VERTEX", 0, "Vertex", "The object is parented to a vertex"},
{PARVERT3, "VERTEX_3", 0, "3 Vertices", ""},
{PARBONE, "BONE", 0, "Bone", "The object is parented to a bone"},
@ -193,11 +190,8 @@ const EnumPropertyItem rna_enum_metaelem_type_items[] = {
{MB_BALL, "BALL", ICON_META_BALL, "Ball", ""},
{MB_TUBE, "CAPSULE", ICON_META_CAPSULE, "Capsule", ""},
{MB_PLANE, "PLANE", ICON_META_PLANE, "Plane", ""},
{MB_ELIPSOID,
"ELLIPSOID",
ICON_META_ELLIPSOID,
"Ellipsoid",
""}, /* NOTE: typo at original definition! */
/* NOTE: typo at original definition! */
{MB_ELIPSOID, "ELLIPSOID", ICON_META_ELLIPSOID, "Ellipsoid", ""},
{MB_CUBE, "CUBE", ICON_META_CUBE, "Cube", ""},
{0, NULL, 0, NULL, NULL},
};
@ -714,9 +708,8 @@ void rna_object_vgroup_name_set(PointerRNA *ptr, const char *value, char *result
Object *ob = (Object *)ptr->id.data;
bDeformGroup *dg = defgroup_find_name(ob, value);
if (dg) {
BLI_strncpy(result,
value,
maxlen); /* no need for BLI_strncpy_utf8, since this matches an existing group */
/* No need for BLI_strncpy_utf8, since this matches an existing group. */
BLI_strncpy(result, value, maxlen);
return;
}
@ -798,9 +791,8 @@ void rna_object_fmap_name_set(PointerRNA *ptr, const char *value, char *result,
Object *ob = (Object *)ptr->id.data;
bFaceMap *fmap = BKE_object_facemap_find_name(ob, value);
if (fmap) {
BLI_strncpy(result,
value,
maxlen); /* no need for BLI_strncpy_utf8, since this matches an existing group */
/* No need for BLI_strncpy_utf8, since this matches an existing group. */
BLI_strncpy(result, value, maxlen);
return;
}

7
source/blender/makesrna/intern/rna_scene.c
View File

@ -2686,11 +2686,8 @@ static void rna_def_tool_settings(BlenderRNA *brna)
ICON_PIVOT_CURSOR,
"3D Cursor",
"Draw stroke at 3D cursor location"},
{0,
"VIEW",
ICON_RESTRICT_VIEW_ON,
"View",
"Stick stroke to the view "}, /* weird, GP_PROJECT_VIEWALIGN is inverted */
/* Weird, GP_PROJECT_VIEWALIGN is inverted. */
{0, "VIEW", ICON_RESTRICT_VIEW_ON, "View", "Stick stroke to the view "},
{GP_PROJECT_VIEWSPACE | GP_PROJECT_DEPTH_VIEW,
"SURFACE",
ICON_FACESEL,

33
source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
View File

@ -24,31 +24,18 @@
/* **************** Double Edge Mask ******************** */
static bNodeSocketTemplate cmp_node_doubleedgemask_in[] = {
{SOCK_FLOAT,
1,
"Inner Mask",
0.8f,
0.8f,
0.8f,
1.0f,
0.0f,
1.0f,
PROP_NONE}, // inner mask socket definition
{SOCK_FLOAT,
1,
"Outer Mask",
0.8f,
0.8f,
0.8f,
1.0f,
0.0f,
1.0f,
PROP_NONE}, // outer mask socket definition
{-1, 0, ""}, // input socket array terminator
/* Inner mask socket definition. */
{SOCK_FLOAT, 1, "Inner Mask", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f, PROP_NONE},
/* Outer mask socket definition. */
{SOCK_FLOAT, 1, "Outer Mask", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f, PROP_NONE},
/* Input socket array terminator. */
{-1, 0, ""},
};
static bNodeSocketTemplate cmp_node_doubleedgemask_out[] = {
{SOCK_FLOAT, 0, "Mask"}, // output socket definition
{-1, 0, ""}, // output socket array terminator
/* Output socket definition. */
{SOCK_FLOAT, 0, "Mask"},
/* Output socket array terminator. */
{-1, 0, ""},
};
void register_node_type_cmp_doubleedgemask(void)