forked from bartvdbraak/blender
Cleanup: clang format
This commit is contained in:
parent
671eb29d43
commit
8d81a3da37
@ -308,10 +308,8 @@ void ArmatureExporter::add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW:
|
||||
workmat[3][0] = workmat[3][1] = workmat[3][2] = 0.0f;
|
||||
|
||||
mul_m4_m4m4(mat, workmat, mat);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (this->export_settings.get_limit_precision()) {
|
||||
|
@ -98,7 +98,10 @@ void BCMatrix::add_transform(Matrix &to, const Matrix &transform, const Matrix &
|
||||
}
|
||||
}
|
||||
|
||||
void BCMatrix::apply_transform(Matrix &to, const Matrix &transform, const Matrix &from, bool inverse)
|
||||
void BCMatrix::apply_transform(Matrix &to,
|
||||
const Matrix &transform,
|
||||
const Matrix &from,
|
||||
bool inverse)
|
||||
{
|
||||
Matrix globinv;
|
||||
invert_m4_m4(globinv, transform);
|
||||
|
@ -29,8 +29,7 @@ void TransformWriter::add_joint_transform(COLLADASW::Node &node,
|
||||
float mat[4][4],
|
||||
float parent_mat[4][4],
|
||||
BCExportSettings &export_settings,
|
||||
bool has_restmat
|
||||
)
|
||||
bool has_restmat)
|
||||
{
|
||||
float local[4][4];
|
||||
|
||||
@ -106,8 +105,7 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node &node,
|
||||
}
|
||||
}
|
||||
|
||||
void TransformWriter::add_node_transform_identity(
|
||||
COLLADASW::Node &node,
|
||||
void TransformWriter::add_node_transform_identity(COLLADASW::Node &node,
|
||||
BCExportSettings &export_settings)
|
||||
{
|
||||
BC_export_transformation_type transformation_type =
|
||||
|
@ -3307,7 +3307,8 @@ static int reveal_exec(bContext *C, wmOperator *op)
|
||||
}
|
||||
|
||||
if (changed) {
|
||||
DEG_id_tag_update(obedit->data, ID_RECALC_COPY_ON_WRITE | ID_RECALC_SELECT | ID_RECALC_GEOMETRY);
|
||||
DEG_id_tag_update(obedit->data,
|
||||
ID_RECALC_COPY_ON_WRITE | ID_RECALC_SELECT | ID_RECALC_GEOMETRY);
|
||||
WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
|
||||
changed_multi = true;
|
||||
}
|
||||
|
@ -172,8 +172,8 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
|
||||
use_blender_profile = RNA_boolean_get(op->ptr, "use_blender_profile");
|
||||
sort_by_name = RNA_boolean_get(op->ptr, "sort_by_name");
|
||||
|
||||
export_object_transformation_type = RNA_enum_get(
|
||||
op->ptr, "export_object_transformation_type_selection");
|
||||
export_object_transformation_type = RNA_enum_get(op->ptr,
|
||||
"export_object_transformation_type_selection");
|
||||
export_animation_transformation_type = RNA_enum_get(
|
||||
op->ptr, "export_animation_transformation_type_selection");
|
||||
|
||||
@ -271,8 +271,8 @@ static void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr)
|
||||
bool include_animations = RNA_boolean_get(imfptr, "include_animations");
|
||||
int ui_section = RNA_enum_get(imfptr, "prop_bc_export_ui_section");
|
||||
|
||||
BC_export_animation_type animation_type = RNA_enum_get(
|
||||
imfptr, "export_animation_type_selection");
|
||||
BC_export_animation_type animation_type = RNA_enum_get(imfptr,
|
||||
"export_animation_type_selection");
|
||||
|
||||
BC_export_transformation_type animation_transformation_type = RNA_enum_get(
|
||||
imfptr, "export_animation_transformation_type_selection");
|
||||
@ -727,7 +727,7 @@ void WM_OT_collada_export(wmOperatorType *ot)
|
||||
INT_MAX,
|
||||
"Transform",
|
||||
"Transformation type for translation, scale and rotation\n"
|
||||
"Note: The Animation transformation type in the Anim Tab\n"\
|
||||
"Note: The Animation transformation type in the Anim Tab\n"
|
||||
"is always equal to the Object transformation type in the Geom tab",
|
||||
INT_MIN,
|
||||
INT_MAX);
|
||||
|
@ -1336,8 +1336,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
|
||||
DEG_id_tag_update(&tob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
|
||||
}
|
||||
/* special support for dupligroups */
|
||||
else if (tob->instance_collection &&
|
||||
tob->instance_collection->id.tag & LIB_TAG_DOIT) {
|
||||
else if (tob->instance_collection && tob->instance_collection->id.tag & LIB_TAG_DOIT) {
|
||||
DEG_id_tag_update(&tob->id, ID_RECALC_TRANSFORM);
|
||||
DEG_id_tag_update(&tob->instance_collection->id, ID_RECALC_COPY_ON_WRITE);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user