[Bf-blender-cvs] [a958725f814] master: Fix unused parameter `ftext`
Germano Cavalcante
noreply at git.blender.org
Fri May 22 19:44:05 CEST 2020
Commit: a958725f814ff6f223950e63a2b3fb8e40a3388c
Author: Germano Cavalcante
Date: Fri May 22 14:05:51 2020 -0300
Branches: master
https://developer.blender.org/rBa958725f814ff6f223950e63a2b3fb8e40a3388c
Fix unused parameter `ftext`
===================================================================
M source/blender/editors/transform/transform_constraints.c
===================================================================
diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c
index d13fa6de7c5..a3fb09f3edf 100644
--- a/source/blender/editors/transform/transform_constraints.c
+++ b/source/blender/editors/transform/transform_constraints.c
@@ -654,40 +654,42 @@ void setLocalConstraint(TransInfo *t, int mode, const char text[])
*/
void setUserConstraint(TransInfo *t, short orientation, int mode, const char ftext[])
{
+ char text[256];
const char *spacename = transform_orientations_spacename_get(t, orientation);
+ BLI_snprintf(text, sizeof(text), ftext, spacename);
switch (orientation) {
case V3D_ORIENT_GLOBAL: {
- setConstraint(t, mode, spacename);
+ setConstraint(t, mode, text);
break;
}
case V3D_ORIENT_LOCAL:
- setLocalConstraint(t, mode, spacename);
+ setLocalConstraint(t, mode, text);
break;
case V3D_ORIENT_NORMAL:
if (checkUseAxisMatrix(t)) {
- setAxisMatrixConstraint(t, mode, spacename);
+ setAxisMatrixConstraint(t, mode, text);
}
else {
- setConstraint(t, mode, spacename);
+ setConstraint(t, mode, text);
}
break;
case V3D_ORIENT_VIEW:
- setConstraint(t, mode, spacename);
+ setConstraint(t, mode, text);
break;
case V3D_ORIENT_CURSOR:
- setConstraint(t, mode, spacename);
+ setConstraint(t, mode, text);
break;
case V3D_ORIENT_GIMBAL:
- setConstraint(t, mode, spacename);
+ setConstraint(t, mode, text);
break;
case V3D_ORIENT_CUSTOM_MATRIX:
- setConstraint(t, mode, spacename);
+ setConstraint(t, mode, text);
break;
case V3D_ORIENT_CUSTOM:
default: {
BLI_assert(orientation >= V3D_ORIENT_CUSTOM);
- setConstraint(t, mode, spacename);
+ setConstraint(t, mode, text);
break;
}
}
More information about the Bf-blender-cvs
mailing list