[Bf-blender-cvs] [49bd44f5c8d] master: Cleanup: unused variable warning
Campbell Barton
noreply at git.blender.org
Mon Jun 1 07:05:51 CEST 2020
Commit: 49bd44f5c8d46266e9cf848a91ef85ebdac02629
Author: Campbell Barton
Date: Mon Jun 1 15:04:47 2020 +1000
Branches: master
https://developer.blender.org/rB49bd44f5c8d46266e9cf848a91ef85ebdac02629
Cleanup: unused variable warning
Also remove unnecessary function return value.
===================================================================
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_orientations.c
===================================================================
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 7720660e2e8..9cd9ddfd811 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -920,7 +920,7 @@ struct TransformOrientation *addMatrixSpace(struct bContext *C,
float mat[3][3],
const char *name,
const bool overwrite);
-bool applyTransformOrientation(const struct TransformOrientation *ts,
+void applyTransformOrientation(const struct TransformOrientation *ts,
float r_mat[3][3],
char r_name[64]);
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index 18ea73a01be..cd170b144d8 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -397,14 +397,12 @@ int BIF_countTransformOrientation(const bContext *C)
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) {
BLI_strncpy(r_name, ts->name, MAX_NAME);
}
copy_m3_m3(r_mat, ts->mat);
-
- return true;
}
/* Updates all `BONE_TRANSFORM` flags.
@@ -465,8 +463,6 @@ short ED_transform_calc_orientation_from_type_ex(const bContext *C,
int orientation_index_custom,
const int pivot_point)
{
- bool ok = false;
-
switch (orientation_type) {
case V3D_ORIENT_GLOBAL: {
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);
TransformOrientation *custom_orientation = BKE_scene_transform_orientation_find(
scene, orientation_index_custom);
- if (applyTransformOrientation(custom_orientation, r_mat, NULL)) {
- ok = true;
- }
+ applyTransformOrientation(custom_orientation, r_mat, NULL);
break;
}
}
More information about the Bf-blender-cvs
mailing list