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

Cleanup: fix compiler warnings.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-10-23 12:50:31 +02:00
parent e1a66201da
commit 727d6644da
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/font.c
View File

@@ -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:

3
source/blender/editors/armature/pose_select.c
View File

@@ -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)