diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-23 13:50:31 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-24 12:14:49 +0300 |
commit | 727d6644da08a66673dd4fb7665a1796d2fd1866 (patch) | |
tree | 3b2197d4ed7a64558f376d2593f5b408701e498c /source/blender | |
parent | e1a66201da2595b8d5afd7072a1f3730ca34d04a (diff) |
Cleanup: fix compiler warnings.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/font.c | 4 | ||||
-rw-r--r-- | source/blender/editors/armature/pose_select.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 51ab82fd593..053a9b964a1 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -1053,7 +1053,7 @@ makebreak: textbox_scale(&tb_scale, &cu->tb[tb_index], 1.0f / cu->fsize); /* The initial Y origin of the textbox is hardcoded to 1.0f * text scale. */ const float textbox_y_origin = 1.0f; - float yoff; + float yoff = 0.0f; switch (cu->align_y) { case CU_ALIGN_Y_TOP_BASELINE: @@ -1084,7 +1084,7 @@ makebreak: } else { /* Non text-box case handled separately. */ - float yoff; + float yoff = 0.0f; switch (cu->align_y) { case CU_ALIGN_Y_TOP_BASELINE: diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c index 08ac5d1ec51..0c7de754482 100644 --- a/source/blender/editors/armature/pose_select.c +++ b/source/blender/editors/armature/pose_select.c @@ -711,6 +711,7 @@ static bool pose_select_same_group(bContext *C, bool extend) groups_len++; group_flags_array = MEM_callocN(objects_len * groups_len * sizeof(bool), "pose_select_same_group"); + group_flags = NULL; ob_index = -1; ob_prev = NULL; CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, visible_pose_bones, Object, *ob) @@ -736,6 +737,7 @@ static bool pose_select_same_group(bContext *C, bool extend) /* small optimization: only loop through bones a second time if there are any groups tagged */ if (tagged) { + group_flags = NULL; ob_index = -1; ob_prev = NULL; /* only if group matches (and is not selected or current bone) */ @@ -791,6 +793,7 @@ static bool pose_select_same_layer(bContext *C, bool extend) layers_array = MEM_callocN(objects_len * sizeof(*layers_array), "pose_select_same_layer"); /* Figure out what bones are selected. */ + layers = NULL; ob_prev = NULL; ob_index = -1; CTX_DATA_BEGIN_WITH_ID (C, bPoseChannel *, pchan, visible_pose_bones, Object *, ob) |