diff options
author | Hans Goudey <h.goudey@me.com> | 2020-12-23 21:13:44 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-12-23 21:13:44 +0300 |
commit | c9efb5424079189951a0eebc968a33787878b039 (patch) | |
tree | 4740576815a140f630471b320c272436cf6312d2 /source | |
parent | d8dc4c5b32b4cb08e2d438d76f6a02e732d23220 (diff) |
Cleanup: Clang format
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/compositor/nodes/COM_ColorExposureNode.cpp | 2 | ||||
-rw-r--r-- | source/blender/editors/space_clip/clip_buttons.c | 56 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_brush_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_fluid_types.h | 42 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 5 |
5 files changed, 54 insertions, 53 deletions
diff --git a/source/blender/compositor/nodes/COM_ColorExposureNode.cpp b/source/blender/compositor/nodes/COM_ColorExposureNode.cpp index 10738fcfe47..cd0285ac373 100644 --- a/source/blender/compositor/nodes/COM_ColorExposureNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorExposureNode.cpp @@ -26,7 +26,7 @@ ExposureNode::ExposureNode(bNode *editorNode) : Node(editorNode) } void ExposureNode::convertToOperations(NodeConverter &converter, - const CompositorContext & /*context*/) const + const CompositorContext & /*context*/) const { ExposureOperation *operation = new ExposureOperation(); converter.addOperation(operation); diff --git a/source/blender/editors/space_clip/clip_buttons.c b/source/blender/editors/space_clip/clip_buttons.c index fe03a37d4aa..78dc6eabbd2 100644 --- a/source/blender/editors/space_clip/clip_buttons.c +++ b/source/blender/editors/space_clip/clip_buttons.c @@ -124,7 +124,7 @@ void uiTemplateMovieClip( } PointerRNA clipptr = RNA_property_pointer_get(ptr, prop); - MovieClip *clip = clipptr.data; + MovieClip *clip = clipptr.data; uiLayoutSetContextPointer(layout, "edit_movieclip", &clipptr); @@ -447,20 +447,20 @@ void uiTemplateMarker(uiLayout *layout, } uiBut *bt = uiDefIconButBitI(block, - UI_BTYPE_TOGGLE_N, - MARKER_DISABLED, - 0, - ICON_HIDE_OFF, - 0, - 0, - UI_UNIT_X, - UI_UNIT_Y, - &cb->marker_flag, - 0, - 0, - 1, - 0, - tip); + UI_BTYPE_TOGGLE_N, + MARKER_DISABLED, + 0, + ICON_HIDE_OFF, + 0, + 0, + UI_UNIT_X, + UI_UNIT_Y, + &cb->marker_flag, + 0, + 0, + 1, + 0, + tip); UI_but_funcN_set(bt, marker_update_cb, cb, NULL); UI_but_drawflag_enable(bt, UI_BUT_ICON_REVERSE); } @@ -561,19 +561,19 @@ void uiTemplateMarker(uiLayout *layout, 0, ""); uiBut *bt = uiDefButF(block, - UI_BTYPE_NUM, - B_MARKER_POS, - IFACE_("X:"), - 0.5 * UI_UNIT_X, - 9 * UI_UNIT_Y, - 7.25 * UI_UNIT_X, - UI_UNIT_Y, - &cb->marker_pos[0], - -10 * width, - 10.0 * width, - 0, - 0, - TIP_("X-position of marker at frame in screen coordinates")); + UI_BTYPE_NUM, + B_MARKER_POS, + IFACE_("X:"), + 0.5 * UI_UNIT_X, + 9 * UI_UNIT_Y, + 7.25 * UI_UNIT_X, + UI_UNIT_Y, + &cb->marker_pos[0], + -10 * width, + 10.0 * width, + 0, + 0, + TIP_("X-position of marker at frame in screen coordinates")); UI_but_number_step_size_set(bt, step); UI_but_number_precision_set(bt, digits); bt = uiDefButF(block, diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 1709ea5dc63..4b020019062 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -373,7 +373,7 @@ typedef struct Brush { typedef struct tPaletteColorHSV { float rgb[3]; float value; - float h; + float h; float s; float v; } tPaletteColorHSV; diff --git a/source/blender/makesdna/DNA_fluid_types.h b/source/blender/makesdna/DNA_fluid_types.h index 2ba0d15fbb3..e787b44e557 100644 --- a/source/blender/makesdna/DNA_fluid_types.h +++ b/source/blender/makesdna/DNA_fluid_types.h @@ -290,7 +290,7 @@ enum { #define FLUID_NAME_GUIDING "fluid_guiding" /* Fluid object names.*/ -#define FLUID_NAME_FLAGS "flags" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_FLAGS "flags" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_VELOCITY "velocity" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_VEL "vel" #define FLUID_NAME_VELOCITYTMP "velocity_previous" /* == OpenVDB grid attribute name. */ @@ -301,7 +301,7 @@ enum { #define FLUID_NAME_PHIOBS "phi_obstacle" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_PHISIN "phiSIn" #define FLUID_NAME_PHIIN "phi_inflow" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_PHIOUT "phi_out" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_PHIOUT "phi_out" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_FORCES "forces" #define FLUID_NAME_FORCE_X "x_force" #define FLUID_NAME_FORCE_Y "y_force" @@ -323,37 +323,37 @@ enum { #define FLUID_NAME_PHIOUTIN "phi_out_inflow" /* Smoke object names. */ -#define FLUID_NAME_SHADOW "shadow" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_SHADOW "shadow" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_EMISSION "emission" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_EMISSIONIN "emissionIn" -#define FLUID_NAME_DENSITY "density" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_DENSITY "density" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_DENSITYIN "density_inflow" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_HEAT "heat" #define FLUID_NAME_HEATIN "heatIn" -#define FLUID_NAME_TEMPERATURE "temperature" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_TEMPERATURE "temperature" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_TEMPERATUREIN "temperature_inflow" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_COLORR "color_r" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_COLORG "color_g" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_COLORB "color_b" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_COLORRIN "color_r_inflow" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_COLORGIN "color_g_inflow" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_COLORBIN "color_b_inflow" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_FLAME "flame" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_FUEL "fuel" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_REACT "react" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_FUELIN "fuel_inflow" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_REACTIN "react_inflow" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_COLORR "color_r" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_COLORG "color_g" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_COLORB "color_b" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_COLORRIN "color_r_inflow" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_COLORGIN "color_g_inflow" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_COLORBIN "color_b_inflow" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_FLAME "flame" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_FUEL "fuel" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_REACT "react" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_FUELIN "fuel_inflow" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_REACTIN "react_inflow" /* == OpenVDB grid attribute name. */ /* Liquid object names. */ #define FLUID_NAME_PHIPARTS "phi_particles" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_PHI "phi" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_PHITMP "phi_previous" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_PHI "phi" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_PHITMP "phi_previous" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_VELOCITYOLD "velOld" #define FLUID_NAME_VELOCITYPARTS "velParts" #define FLUID_NAME_MAPWEIGHTS "mapWeights" #define FLUID_NAME_PP "pp" #define FLUID_NAME_PVEL "pVel" -#define FLUID_NAME_PARTS "particles" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_PARTS "particles" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_PARTSVELOCITY "particles_velocity" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_PINDEX "pindex" #define FLUID_NAME_GPI "gpi" @@ -376,8 +376,8 @@ enum { #define FLUID_NAME_TEXTURE_U2 "textureU2" #define FLUID_NAME_TEXTURE_V2 "textureV2" #define FLUID_NAME_TEXTURE_W2 "textureW2" -#define FLUID_NAME_UV0 "uv_grid_0" /* == OpenVDB grid attribute name. */ -#define FLUID_NAME_UV1 "uv_grid_1" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_UV0 "uv_grid_0" /* == OpenVDB grid attribute name. */ +#define FLUID_NAME_UV1 "uv_grid_1" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_COLORR_NOISE "color_r_noise" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_COLORG_NOISE "color_g_noise" /* == OpenVDB grid attribute name. */ #define FLUID_NAME_COLORB_NOISE "color_b_noise" /* == OpenVDB grid attribute name. */ diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index b93922e46f2..e37df0225cf 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -4241,8 +4241,9 @@ void rna_def_view_layer_common(StructRNA *srna, const bool scene) prop = RNA_def_property(srna, "use_ztransp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_ZTRA); - RNA_def_property_ui_text( - prop, "Z-Transparent", "Render Z-transparent faces in this layer (on top of Solid and Halos)"); + RNA_def_property_ui_text(prop, + "Z-Transparent", + "Render Z-transparent faces in this layer (on top of Solid and Halos)"); if (scene) { RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); } |