tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: clang-format 

Rerun `make format`.

No functional changes.
This commit is contained in:
Sybren A. Stüvel 2020-12-04 11:28:56 +01:00
parent 958df2ed1b
commit 1166110a9d
7 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/constraint.c
View File

@ -1627,7 +1627,7 @@ static bConstraintTypeInfo CTI_LOCLIMIT = {
"Limit Location", /* name */
"bLocLimitConstraint", /* struct name */
NULL, /* free data */
custom_space_id_looper, /* id looper */
custom_space_id_looper, /* id looper */
NULL, /* copy data */
NULL, /* new data */
get_space_tar, /* get constraint targets */
@ -1690,7 +1690,7 @@ static bConstraintTypeInfo CTI_ROTLIMIT = {
"Limit Rotation", /* name */
"bRotLimitConstraint", /* struct name */
NULL, /* free data */
custom_space_id_looper, /* id looper */
custom_space_id_looper, /* id looper */
NULL, /* copy data */
NULL, /* new data */
get_space_tar, /* get constraint targets */
@ -1757,7 +1757,7 @@ static bConstraintTypeInfo CTI_SIZELIMIT = {
"Limit Scale", /* name */
"bSizeLimitConstraint", /* struct name */
NULL, /* free data */
custom_space_id_looper, /* id looper */
custom_space_id_looper, /* id looper */
NULL, /* copy data */
NULL, /* new data */
get_space_tar, /* get constraint targets */
@ -2318,7 +2318,7 @@ static bConstraintTypeInfo CTI_SAMEVOL = {
"Maintain Volume", /* name */
"bSameVolumeConstraint", /* struct name */
NULL, /* free data */
custom_space_id_looper, /* id looper */
custom_space_id_looper, /* id looper */
NULL, /* copy data */
samevolume_new_data, /* new data */
get_space_tar, /* get constraint targets */

2
source/blender/draw/engines/image/image_private.h
View File

@ -43,7 +43,7 @@ typedef struct IMAGE_PrivateData {
void *lock;
struct ImBuf *ibuf;
struct Image *image;
struct DRWView* view;
struct DRWView *view;
struct GPUTexture *texture;
bool owns_texture;

4
source/blender/editors/sculpt_paint/sculpt_face_set.c
View File

@ -1307,8 +1307,8 @@ static int sculpt_face_set_edit_invoke(bContext *C, wmOperator *op, const wmEven
SculptCursorGeometryInfo sgi;
const float mouse[2] = {event->mval[0], event->mval[1]};
if (!SCULPT_cursor_geometry_info_update(C, &sgi, mouse, false)) {
/* The cursor is not over the mesh. Cancel to avoid editing the last updated Face Set ID. */
return OPERATOR_CANCELLED;
/* The cursor is not over the mesh. Cancel to avoid editing the last updated Face Set ID. */
return OPERATOR_CANCELLED;
}
const int active_face_set = SCULPT_active_face_set_get(ss);

1
source/blender/editors/space_graph/graph_select.c
View File

@ -501,7 +501,6 @@ void GRAPH_OT_select_all(wmOperatorType *ot)
* The selection backend is also reused for the Lasso and Circle select operators.
*/
static rctf initialize_box_select_coords(const bAnimContext *ac, const rctf *rectf_view)
{
const View2D *v2d = &ac->region->v2d;

11
source/blender/makesdna/DNA_layer_types.h
View File

@ -65,12 +65,13 @@ typedef enum eViewLayerAOVFlag {
/* #ViewLayer.cryptomatte_flag */
typedef enum eViewLayerCryptomatteFlags {
VIEW_LAYER_CRYPTOMATTE_OBJECT = (1<<0),
VIEW_LAYER_CRYPTOMATTE_MATERIAL = (1<<1),
VIEW_LAYER_CRYPTOMATTE_ASSET = (1<<2),
VIEW_LAYER_CRYPTOMATTE_ACCURATE = (1<<3),
VIEW_LAYER_CRYPTOMATTE_OBJECT = (1 << 0),
VIEW_LAYER_CRYPTOMATTE_MATERIAL = (1 << 1),
VIEW_LAYER_CRYPTOMATTE_ASSET = (1 << 2),
VIEW_LAYER_CRYPTOMATTE_ACCURATE = (1 << 3),
} eViewLayerCryptomatteFlags;
#define VIEW_LAYER_CRYPTOMATTE_ALL (VIEW_LAYER_CRYPTOMATTE_OBJECT | VIEW_LAYER_CRYPTOMATTE_MATERIAL | VIEW_LAYER_CRYPTOMATTE_ASSET)
#define VIEW_LAYER_CRYPTOMATTE_ALL \
(VIEW_LAYER_CRYPTOMATTE_OBJECT | VIEW_LAYER_CRYPTOMATTE_MATERIAL | VIEW_LAYER_CRYPTOMATTE_ASSET)
typedef struct Base {
struct Base *next, *prev;

2
source/blender/makesdna/DNA_modifier_types.h
View File

@ -1588,7 +1588,7 @@ typedef struct WeightVGProximityModifierData {
/** Name of vertex group to modify/weight. MAX_VGROUP_NAME. */
char defgrp_name[64];
/* Mapping stuff. */
/** The custom mapping curve!. */
struct CurveMapping *cmap_curve;

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

@ -163,7 +163,8 @@ static void rna_ViewLayer_update_render_passes(ID *id)
}
RE_engine_free(engine);
engine = NULL;
}}
}
}
static PointerRNA rna_ViewLayer_objects_get(CollectionPropertyIterator *iter)
{