Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-01-07 03:38:08 +0300
committerCampbell Barton <campbell@blender.org>2022-01-07 06:16:26 +0300
commit3d3bc748849834ef74563deb603ab43859cffeeb (patch)
treede74ce4722b2cb032c22dbc090a15dd2e172c29b /source/blender/io/collada
parentbb69c19f08ac681d4386325e4318ebfbef2e9531 (diff)
Cleanup: remove redundant const qualifiers for POD types
MSVC used to warn about const mismatch for arguments passed by value. Remove these as newer versions of MSVC no longer show this warning.
Diffstat (limited to 'source/blender/io/collada')
-rw-r--r--source/blender/io/collada/AnimationImporter.h2
-rw-r--r--source/blender/io/collada/ArmatureImporter.h2
-rw-r--r--source/blender/io/collada/BCAnimationCurve.h16
-rw-r--r--source/blender/io/collada/BCMath.h18
-rw-r--r--source/blender/io/collada/BCSampleData.h2
-rw-r--r--source/blender/io/collada/collada_utils.h14
6 files changed, 27 insertions, 27 deletions
diff --git a/source/blender/io/collada/AnimationImporter.h b/source/blender/io/collada/AnimationImporter.h
index a4624a18cd5..909a3017e66 100644
--- a/source/blender/io/collada/AnimationImporter.h
+++ b/source/blender/io/collada/AnimationImporter.h
@@ -211,7 +211,7 @@ class AnimationImporter : private TransformReader, public AnimationImporterBase
*/
void Assign_lens_animations(const COLLADAFW::UniqueId &listid,
ListBase *AnimCurves,
- const double aspect,
+ double aspect,
Camera *cam,
const char *anim_type,
int fov_type);
diff --git a/source/blender/io/collada/ArmatureImporter.h b/source/blender/io/collada/ArmatureImporter.h
index ea78efeb5d7..fc0333b0ab1 100644
--- a/source/blender/io/collada/ArmatureImporter.h
+++ b/source/blender/io/collada/ArmatureImporter.h
@@ -120,7 +120,7 @@ class ArmatureImporter : private TransformReader {
void fix_leaf_bone_hierarchy(bArmature *armature, Bone *bone, bool fix_orientation);
void fix_leaf_bone(bArmature *armature, EditBone *ebone, BoneExtended *be, bool fix_orientation);
void fix_parent_connect(bArmature *armature, Bone *bone);
- void connect_bone_chains(bArmature *armature, Bone *bone, const int max_chain_length);
+ void connect_bone_chains(bArmature *armature, Bone *bone, int max_chain_length);
void set_pose(Object *ob_arm,
COLLADAFW::Node *root_node,
diff --git a/source/blender/io/collada/BCAnimationCurve.h b/source/blender/io/collada/BCAnimationCurve.h
index 36b2a5e8509..cf4cb4e0642 100644
--- a/source/blender/io/collada/BCAnimationCurve.h
+++ b/source/blender/io/collada/BCAnimationCurve.h
@@ -59,8 +59,8 @@ class BCCurveKey {
BCCurveKey();
BCCurveKey(const BC_animation_type type,
const std::string path,
- const int array_index,
- const int subindex = -1);
+ int array_index,
+ int subindex = -1);
void operator=(const BCCurveKey &other);
std::string get_full_path() const;
std::string get_path() const;
@@ -127,7 +127,7 @@ class BCAnimationCurve {
FCurve *get_fcurve() const;
int sample_count() const;
- float get_value(const float frame);
+ float get_value(float frame);
void get_values(BCValues &values) const;
void get_value_map(BCValueMap &value_map);
@@ -135,14 +135,14 @@ class BCAnimationCurve {
/* Curve edit functions create a copy of the underlying #FCurve. */
FCurve *get_edit_fcurve();
- bool add_value_from_rna(const int frame);
- bool add_value_from_matrix(const BCSample &sample, const int frame);
- void add_value(const float val, const int frame);
+ bool add_value_from_rna(int frame);
+ bool add_value_from_matrix(const BCSample &sample, int frame);
+ void add_value(float val, int frame);
void clean_handles();
/* experimental stuff */
- int closest_index_above(const float sample_frame, const int start_at) const;
- int closest_index_below(const float sample_frame) const;
+ int closest_index_above(float sample_frame, int start_at) const;
+ int closest_index_below(float sample_frame) const;
};
typedef std::map<BCCurveKey, BCAnimationCurve *> BCAnimationCurveMap;
diff --git a/source/blender/io/collada/BCMath.h b/source/blender/io/collada/BCMath.h
index 503a76541fd..dbcfe96bc61 100644
--- a/source/blender/io/collada/BCMath.h
+++ b/source/blender/io/collada/BCMath.h
@@ -82,25 +82,25 @@ class BCMatrix {
* We need double here because the OpenCollada API needs it.
* precision = -1 indicates to not limit the precision.
*/
- void get_matrix(DMatrix &matrix, const bool transposed = false, const int precision = -1) const;
+ void get_matrix(DMatrix &matrix, bool transposed = false, int precision = -1) const;
void get_matrix(Matrix &matrix,
- const bool transposed = false,
- const int precision = -1,
- const bool inverted = false) const;
+ bool transposed = false,
+ int precision = -1,
+ bool inverted = false) const;
void set_transform(Object *ob);
void set_transform(Matrix &mat);
void add_transform(Matrix &to,
const Matrix &transform,
const Matrix &from,
- const bool inverted = false);
+ bool inverted = false);
void apply_transform(Matrix &to,
const Matrix &transform,
const Matrix &from,
- const bool inverse = false);
+ bool inverse = false);
void add_inverted_transform(Matrix &to, const Matrix &transform, const Matrix &from);
- void add_transform(const Matrix &matrix, const bool inverted = false);
- void add_transform(const BCMatrix &matrix, const bool inverted = false);
- void apply_transform(const BCMatrix &matrix, const bool inverted = false);
+ void add_transform(const Matrix &matrix, bool inverted = false);
+ void add_transform(const BCMatrix &matrix, bool inverted = false);
+ void apply_transform(const BCMatrix &matrix, bool inverted = false);
bool in_range(const BCMatrix &other, float distance) const;
diff --git a/source/blender/io/collada/BCSampleData.h b/source/blender/io/collada/BCSampleData.h
index dccc5228c4f..a76466a42f5 100644
--- a/source/blender/io/collada/BCSampleData.h
+++ b/source/blender/io/collada/BCSampleData.h
@@ -54,7 +54,7 @@ class BCSample {
void add_bone_matrix(Bone *bone, Matrix &mat);
/** Get channel value. */
- bool get_value(std::string channel_target, const int array_index, float *val) const;
+ bool get_value(std::string channel_target, int array_index, float *val) const;
const BCMatrix &get_matrix() const;
const BCMatrix *get_matrix(Bone *bone) const; /* returns NULL if bone is not animated */
};
diff --git a/source/blender/io/collada/collada_utils.h b/source/blender/io/collada/collada_utils.h
index cf62ea0a275..e06f7b2cb8b 100644
--- a/source/blender/io/collada/collada_utils.h
+++ b/source/blender/io/collada/collada_utils.h
@@ -291,23 +291,23 @@ extern bool bc_has_animations(Object *ob);
extern void bc_add_global_transform(Matrix &to_mat,
const Matrix &from_mat,
const BCMatrix &global_transform,
- const bool invert = false);
+ bool invert = false);
extern void bc_add_global_transform(Vector &to_vec,
const Vector &from_vec,
const BCMatrix &global_transform,
- const bool invert = false);
+ bool invert = false);
extern void bc_add_global_transform(Vector &to_vec,
const BCMatrix &global_transform,
- const bool invert = false);
+ bool invert = false);
extern void bc_add_global_transform(Matrix &to_mat,
const BCMatrix &global_transform,
- const bool invert = false);
+ bool invert = false);
extern void bc_apply_global_transform(Matrix &to_mat,
const BCMatrix &global_transform,
- const bool invert = false);
+ bool invert = false);
extern void bc_apply_global_transform(Vector &to_vec,
const BCMatrix &global_transform,
- const bool invert = false);
+ bool invert = false);
/**
* Check if custom information about bind matrix exists and modify the from_mat
* accordingly.
@@ -382,7 +382,7 @@ class BoneExtended {
void set_name(char *aName);
char *get_name();
- void set_chain_length(const int aLength);
+ void set_chain_length(int aLength);
int get_chain_length();
void set_leaf_bone(bool state);