Commit: bddc987ba333d7308b35d09d14d97e750ebab11c
Author: Campbell Barton
Date: Thu May 13 12:44:11 2021 +1000
Branches: master
https://developer.blender.org/rBbddc987ba333d7308b35d09d14d97e750ebab11c
Cleanup: clang format
===================================================================
M source/blender/draw/engines/eevee/eevee_cryptomatte.c
M source/blender/draw/engines/overlay/overlay_armature.c
M source/blender/makesdna/DNA_action_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesrna/intern/rna_pose.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_cryptomatte.c
b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
index eace4eb18f6..70d48ea6040 100644
--- a/source/blender/draw/engines/eevee/eevee_cryptomatte.c
+++ b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
@@ -158,9 +158,9 @@ void EEVEE_cryptomatte_output_init(EEVEE_ViewLayerData
*UNUSED(sldata),
const ViewLayer *view_layer = draw_ctx->view_layer;
const int num_cryptomatte_layers =
eevee_cryptomatte_layers_count(view_layer);
- eGPUTextureFormat format = (num_cryptomatte_layers == 1) ? GPU_R32F :
- (num_cryptomatte_layers == 2) ? GPU_RG32F :
- GPU_RGBA32F;
+ eGPUTextureFormat format = (num_cryptomatte_layers == 1) ?
+ GPU_R32F :
+ (num_cryptomatte_layers == 2) ? GPU_RG32F :
GPU_RGBA32F;
const float *viewport_size = DRW_viewport_size_get();
const int buffer_size = viewport_size[0] * viewport_size[1];
diff --git a/source/blender/draw/engines/overlay/overlay_armature.c
b/source/blender/draw/engines/overlay/overlay_armature.c
index acda07d7841..fbad60ff4ab 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.c
+++ b/source/blender/draw/engines/overlay/overlay_armature.c
@@ -1286,9 +1286,10 @@ static void draw_axes(ArmatureDrawContext *ctx,
const bArmature *arm)
{
float final_col[4];
- const float *col = (ctx->const_color) ?
ctx->const_color :
- (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ?
G_draw.block.colorTextHi :
-
G_draw.block.colorText;
+ const float *col = (ctx->const_color) ?
+ ctx->const_color :
+ (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ?
G_draw.block.colorTextHi :
+
G_draw.block.colorText;
copy_v4_v4(final_col, col);
/* Mix with axes color. */
final_col[3] = (ctx->const_color) ? 1.0 : (BONE_FLAG(eBone, pchan) &
BONE_SELECTED) ? 0.1 : 0.65;
diff --git a/source/blender/makesdna/DNA_action_types.h
b/source/blender/makesdna/DNA_action_types.h
index 05d33f5b339..583e56de9c2 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -418,7 +418,6 @@ typedef enum ePchan_DrawFlag {
PCHAN_DRAW_NO_CUSTOM_BONE_SIZE = (1 << 0),
} ePchan_DrawFlag;
-
/* Note: It doesn't take custom_scale_xyz into account */
#define PCHAN_CUSTOM_BONE_LENGTH(pchan) \
(((pchan)->drawflag & PCHAN_DRAW_NO_CUSTOM_BONE_SIZE) ? 1.0f :
(pchan)->bone->length)
diff --git a/source/blender/makesdna/DNA_node_types.h
b/source/blender/makesdna/DNA_node_types.h
index 2fba925ed9f..58c94b6f369 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -1199,7 +1199,7 @@ typedef struct NodeAttributeVectorMath {
typedef struct NodeAttributeVectorRotate {
/* GeometryNodeAttributeVectorRotateMode */
uint8_t mode;
-
+
/* GeometryNodeAttributeInputMode */
uint8_t input_type_vector;
uint8_t input_type_center;
diff --git a/source/blender/makesrna/intern/rna_pose.c
b/source/blender/makesrna/intern/rna_pose.c
index 5ffbe1613e0..b8bb4f58dcd 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -1369,13 +1369,15 @@ static void rna_def_pose_channel(BlenderRNA *brna)
prop = RNA_def_property(srna, "custom_shape_translation", PROP_FLOAT,
PROP_XYZ);
RNA_def_property_float_sdna(prop, NULL, "custom_translation");
RNA_def_property_flag(prop, PROP_PROPORTIONAL);
- RNA_def_property_ui_text(prop, "Custom Shape Translation", "Adjust the
location of the custom shape");
+ RNA_def_property_ui_text(
+ prop, "Custom Shape Translation", "Adjust the location of the custom
shape");
RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1,
RNA_TRANSLATION_PREC_DEFAULT);
RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Pose_update");
prop = RNA_def_property(srna, "custom_shape_rotation_euler", PROP_FLOAT,
PROP_EULER);
RNA_def_property_float_sdna(prop, NULL, "custom_rotation_euler");
- RNA_def_property_ui_text(prop, "Custom Shape Rotation", "Adjust the rotation
of the custom shape");
+ RNA_def_property_ui_text(
+ prop, "Custom Shape Rotation", "Adjust the rotation of the custom
shape");
RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Pose_update");
prop = RNA_def_property(srna, "use_custom_shape_bone_size", PROP_BOOLEAN,
PROP_NONE);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
