Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-02-25 18:17:40 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-02-25 19:22:23 +0300
commitb4b47e6ba27544bcae52fc84852666ee644776f5 (patch)
tree387f8627bf7312f4d6132475896d449e3a566541
parent4f4817943704e8bfddf366d01cf958dc0cce0ac6 (diff)
Cleanup: Reduced indentation in objectsolver_evaluate()
This will make an upcoming change cleaner to implement. No functional changes.
-rw-r--r--source/blender/blenkernel/intern/constraint.c36
1 files changed, 17 insertions, 19 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 42efd9a7057..f8a4ae7ff28 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -4877,37 +4877,35 @@ static void objectsolver_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
if (data->flag & OBJECTSOLVER_ACTIVECLIP) {
clip = scene->clip;
}
-
if (!camob || !clip) {
return;
}
- if (clip) {
- MovieTracking *tracking = &clip->tracking;
- MovieTrackingObject *object;
+ MovieTracking *tracking = &clip->tracking;
+ MovieTrackingObject *object;
- object = BKE_tracking_object_get_named(tracking, data->object);
+ object = BKE_tracking_object_get_named(tracking, data->object);
+ if (!object) {
+ return;
+ }
- if (object) {
- float mat[4][4], obmat[4][4], imat[4][4], cammat[4][4], camimat[4][4], parmat[4][4];
- float ctime = DEG_get_ctime(depsgraph);
- float framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, ctime);
+ float mat[4][4], obmat[4][4], imat[4][4], cammat[4][4], camimat[4][4], parmat[4][4];
+ float ctime = DEG_get_ctime(depsgraph);
+ float framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, ctime);
- BKE_object_where_is_calc_mat4(camob, cammat);
+ BKE_object_where_is_calc_mat4(camob, cammat);
- BKE_tracking_camera_get_reconstructed_interpolate(tracking, object, framenr, mat);
+ BKE_tracking_camera_get_reconstructed_interpolate(tracking, object, framenr, mat);
- invert_m4_m4(camimat, cammat);
- mul_m4_m4m4(parmat, cammat, data->invmat);
+ invert_m4_m4(camimat, cammat);
+ mul_m4_m4m4(parmat, cammat, data->invmat);
- copy_m4_m4(cammat, camob->obmat);
- copy_m4_m4(obmat, cob->matrix);
+ copy_m4_m4(cammat, camob->obmat);
+ copy_m4_m4(obmat, cob->matrix);
- invert_m4_m4(imat, mat);
+ invert_m4_m4(imat, mat);
- mul_m4_series(cob->matrix, cammat, imat, camimat, parmat, obmat);
- }
- }
+ mul_m4_series(cob->matrix, cammat, imat, camimat, parmat, obmat);
}
static bConstraintTypeInfo CTI_OBJECTSOLVER = {