griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Make format

Browse Source
This commit is contained in:
Jeroen Bakker
2023-06-06 14:22:29 +02:00
parent cbefcacdf3
commit 91f9615ed2
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/armature_deform.c
View File

@@ -63,7 +63,7 @@ static void pchan_deform_accumulate(const DualQuat *deform_dq,
if (dq_accum) {
BLI_assert(!co_accum);
if (deform_dq->scale_weight) {
/* FIX https://projects.blender.org/blender/blender/issues/32022 */
DualQuat mdq = *deform_dq;

3
source/blender/editors/sculpt_paint/paint_image_proj.cc
View File

@@ -6631,7 +6631,8 @@ static void default_paint_slot_color_get(int layer_type, Material *ma, float col
bNode *in_node = nullptr;
if (ma && ma->nodetree) {
ma->nodetree->ensure_topology_cache();
const blender::Span<bNode *> nodes = ma->nodetree->nodes_by_type("ShaderNodeBsdfPrincipled");
const blender::Span<bNode *> nodes = ma->nodetree->nodes_by_type(
"ShaderNodeBsdfPrincipled");
in_node = nodes.is_empty() ? nullptr : nodes.first();
}
if (!in_node) {

8
source/blender/makesrna/intern/rna_animation.c
View File

@@ -196,7 +196,8 @@ bool rna_AnimData_tweakmode_override_apply(Main *UNUSED(bmain),
AnimData *anim_data_dst = (AnimData *)ptr_dst->data;
AnimData *anim_data_src = (AnimData *)ptr_src->data;
anim_data_dst->flag =(anim_data_dst->flag & ~ADT_NLA_EDIT_ON) | (anim_data_src->flag & ADT_NLA_EDIT_ON);
anim_data_dst->flag = (anim_data_dst->flag & ~ADT_NLA_EDIT_ON) |
(anim_data_src->flag & ADT_NLA_EDIT_ON);
return true;
}
@@ -1416,8 +1417,9 @@ static void rna_def_animdata(BlenderRNA *brna)
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_EDITABLE | PROP_ID_REFCOUNT);
RNA_def_property_pointer_funcs(
prop, NULL, "rna_AnimData_tmpact_set", NULL, "rna_Action_id_poll");
RNA_def_property_ui_text(
prop, "Tweak Mode Action Storage", "Slot to temporarily hold the main action while in tweak mode");
RNA_def_property_ui_text(prop,
"Tweak Mode Action Storage",
"Slot to temporarily hold the main action while in tweak mode");
RNA_def_property_update(prop, NC_ANIMATION | ND_NLA_ACTCHANGE, "rna_AnimData_dependency_update");
/* Drivers */