Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: unused variable warning

Browse Source 
Also remove unnecessary function return value.
This commit is contained in:
Campbell Barton
2020-06-01 15:04:47 +10:00
parent 81c33f0ba7
commit 49bd44f5c8
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/transform/transform.h
View File

@@ -920,7 +920,7 @@ struct TransformOrientation *addMatrixSpace(struct bContext *C,
float mat[3][3], float mat[3][3],
const char *name, const char *name,
const bool overwrite); const bool overwrite);
bool applyTransformOrientation(const struct TransformOrientation *ts, void applyTransformOrientation(const struct TransformOrientation *ts,
float r_mat[3][3], float r_mat[3][3],
char r_name[64]); char r_name[64]);

10
source/blender/editors/transform/transform_orientations.c
View File

@@ -397,14 +397,12 @@ int BIF_countTransformOrientation(const bContext *C)
return BLI_listbase_count(transform_orientations); return BLI_listbase_count(transform_orientations);
} }
bool applyTransformOrientation(const TransformOrientation *ts, float r_mat[3][3], char *r_name) void applyTransformOrientation(const TransformOrientation *ts, float r_mat[3][3], char *r_name)
{ {
if (r_name) { if (r_name) {
BLI_strncpy(r_name, ts->name, MAX_NAME); BLI_strncpy(r_name, ts->name, MAX_NAME);
} }
copy_m3_m3(r_mat, ts->mat); copy_m3_m3(r_mat, ts->mat);
return true;
} }
/* Updates all `BONE_TRANSFORM` flags. /* Updates all `BONE_TRANSFORM` flags.
@@ -465,8 +463,6 @@ short ED_transform_calc_orientation_from_type_ex(const bContext *C,
int orientation_index_custom, int orientation_index_custom,
const int pivot_point) const int pivot_point)
{ {
bool ok = false;
switch (orientation_type) { switch (orientation_type) {
case V3D_ORIENT_GLOBAL: { case V3D_ORIENT_GLOBAL: {
unit_m3(r_mat); unit_m3(r_mat);
@@ -528,9 +524,7 @@ short ED_transform_calc_orientation_from_type_ex(const bContext *C,
BLI_assert(orientation_type >= V3D_ORIENT_CUSTOM); BLI_assert(orientation_type >= V3D_ORIENT_CUSTOM);
TransformOrientation *custom_orientation = BKE_scene_transform_orientation_find( TransformOrientation *custom_orientation = BKE_scene_transform_orientation_find(
scene, orientation_index_custom); scene, orientation_index_custom);
if (applyTransformOrientation(custom_orientation, r_mat, NULL)) { applyTransformOrientation(custom_orientation, r_mat, NULL);
ok = true;
}
break; break;
} }
} }