archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: clang format

Browse Source
This commit is contained in:
Campbell Barton
2021-05-13 12:44:11 +10:00
parent f1ecbf26b7
commit bddc987ba3
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/draw/engines/eevee/eevee_cryptomatte.c
View File

@@ -158,9 +158,9 @@ void EEVEE_cryptomatte_output_init(EEVEE_ViewLayerData *UNUSED(sldata),
const ViewLayer *view_layer = draw_ctx->view_layer; const ViewLayer *view_layer = draw_ctx->view_layer;
const int num_cryptomatte_layers = eevee_cryptomatte_layers_count(view_layer); const int num_cryptomatte_layers = eevee_cryptomatte_layers_count(view_layer);
eGPUTextureFormat format = (num_cryptomatte_layers == 1) ? GPU_R32F : eGPUTextureFormat format = (num_cryptomatte_layers == 1) ?
(num_cryptomatte_layers == 2) ? GPU_RG32F : GPU_R32F :
GPU_RGBA32F; (num_cryptomatte_layers == 2) ? GPU_RG32F : GPU_RGBA32F;
const float *viewport_size = DRW_viewport_size_get(); const float *viewport_size = DRW_viewport_size_get();
const int buffer_size = viewport_size[0] * viewport_size[1]; const int buffer_size = viewport_size[0] * viewport_size[1];

7
source/blender/draw/engines/overlay/overlay_armature.c
View File

@@ -1286,9 +1286,10 @@ static void draw_axes(ArmatureDrawContext *ctx,
const bArmature *arm) const bArmature *arm)
{ {
float final_col[4]; float final_col[4];
const float *col = (ctx->const_color) ? ctx->const_color : const float *col = (ctx->const_color) ?
(BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? G_draw.block.colorTextHi : ctx->const_color :
G_draw.block.colorText; (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? G_draw.block.colorTextHi :
G_draw.block.colorText;
copy_v4_v4(final_col, col); copy_v4_v4(final_col, col);
/* Mix with axes color. */ /* Mix with axes color. */
final_col[3] = (ctx->const_color) ? 1.0 : (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? 0.1 : 0.65; final_col[3] = (ctx->const_color) ? 1.0 : (BONE_FLAG(eBone, pchan) & BONE_SELECTED) ? 0.1 : 0.65;

1
source/blender/makesdna/DNA_action_types.h
View File

@@ -418,7 +418,6 @@ typedef enum ePchan_DrawFlag {
PCHAN_DRAW_NO_CUSTOM_BONE_SIZE = (1 << 0), PCHAN_DRAW_NO_CUSTOM_BONE_SIZE = (1 << 0),
} ePchan_DrawFlag; } ePchan_DrawFlag;
/* Note: It doesn't take custom_scale_xyz into account */ /* Note: It doesn't take custom_scale_xyz into account */
#define PCHAN_CUSTOM_BONE_LENGTH(pchan) \ #define PCHAN_CUSTOM_BONE_LENGTH(pchan) \
(((pchan)->drawflag & PCHAN_DRAW_NO_CUSTOM_BONE_SIZE) ? 1.0f : (pchan)->bone->length) (((pchan)->drawflag & PCHAN_DRAW_NO_CUSTOM_BONE_SIZE) ? 1.0f : (pchan)->bone->length)

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

@@ -1199,7 +1199,7 @@ typedef struct NodeAttributeVectorMath {
typedef struct NodeAttributeVectorRotate { typedef struct NodeAttributeVectorRotate {
/* GeometryNodeAttributeVectorRotateMode */ /* GeometryNodeAttributeVectorRotateMode */
uint8_t mode; uint8_t mode;
/* GeometryNodeAttributeInputMode */ /* GeometryNodeAttributeInputMode */
uint8_t input_type_vector; uint8_t input_type_vector;
uint8_t input_type_center; uint8_t input_type_center;

6
source/blender/makesrna/intern/rna_pose.c
View File

@@ -1369,13 +1369,15 @@ static void rna_def_pose_channel(BlenderRNA *brna)
prop = RNA_def_property(srna, "custom_shape_translation", PROP_FLOAT, PROP_XYZ); prop = RNA_def_property(srna, "custom_shape_translation", PROP_FLOAT, PROP_XYZ);
RNA_def_property_float_sdna(prop, NULL, "custom_translation"); RNA_def_property_float_sdna(prop, NULL, "custom_translation");
RNA_def_property_flag(prop, PROP_PROPORTIONAL); 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_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Pose_update"); 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); 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_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"); 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); prop = RNA_def_property(srna, "use_custom_shape_bone_size", PROP_BOOLEAN, PROP_NONE);