diff --git a/intern/opensubdiv/internal/evaluator/patch_map.h b/intern/opensubdiv/internal/evaluator/patch_map.h index af804d6ca71..1cb9400245f 100644 --- a/intern/opensubdiv/internal/evaluator/patch_map.h +++ b/intern/opensubdiv/internal/evaluator/patch_map.h @@ -126,7 +126,7 @@ class PatchMap { // Internal methods supporting quadtree construction and queries void assignRootNode(QuadNode *node, int index); - QuadNode *assignLeafOrChildNode(QuadNode *node, bool isLeaf, int quad, int index); + QuadNode *assignLeafOrChildNode(QuadNode *node, bool isLeaf, int quadrant, int index); template static int transformUVToQuadQuadrant(T const &median, T &u, T &v); template diff --git a/source/blender/blenkernel/BKE_image_format.h b/source/blender/blenkernel/BKE_image_format.h index 6a03d1d8df5..8f71e1f4648 100644 --- a/source/blender/blenkernel/BKE_image_format.h +++ b/source/blender/blenkernel/BKE_image_format.h @@ -69,7 +69,7 @@ char BKE_imtype_valid_depths(char imtype); * String is from command line `--render-format` argument, * keep in sync with `creator_args.c` help info. */ -char BKE_imtype_from_arg(const char *arg); +char BKE_imtype_from_arg(const char *imtype_arg); /* Conversion between ImBuf settings. */ diff --git a/source/blender/compositor/realtime_compositor/COM_domain.hh b/source/blender/compositor/realtime_compositor/COM_domain.hh index a4f9eb68db4..54d712f7578 100644 --- a/source/blender/compositor/realtime_compositor/COM_domain.hh +++ b/source/blender/compositor/realtime_compositor/COM_domain.hh @@ -149,7 +149,7 @@ class Domain { /* Transform the domain by the given transformation. This effectively pre-multiply the given * transformation by the current transformation of the domain. */ - void transform(const float3x3 &transformation); + void transform(const float3x3 &input_transformation); /* Returns a domain of size 1x1 and an identity transformation. */ static Domain identity(); diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index d49956e03b2..c72f3121217 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -711,7 +711,7 @@ bool ED_view3d_win_to_segment_clipped(const struct Depsgraph *depsgraph, float r_ray_start[3], float r_ray_end[3], bool do_clip_planes); -void ED_view3d_ob_project_mat_get(const struct RegionView3D *v3d, +void ED_view3d_ob_project_mat_get(const struct RegionView3D *rv3d, const struct Object *ob, float r_pmat[4][4]); void ED_view3d_ob_project_mat_get_from_obmat(const struct RegionView3D *rv3d, diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 658901a6991..02921a5ffec 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -701,12 +701,12 @@ void setLocalConstraint(TransInfo *t, int mode, const char text[]) } } -void setUserConstraint(TransInfo *t, int mode, const char ftext[]) +void setUserConstraint(TransInfo *t, int mode, const char text_[]) { char text[256]; const short orientation = transform_orientation_or_default(t); const char *spacename = transform_orientations_spacename_get(t, orientation); - BLI_snprintf(text, sizeof(text), ftext, spacename); + BLI_snprintf(text, sizeof(text), text_, spacename); switch (orientation) { case V3D_ORIENT_LOCAL: diff --git a/source/blender/editors/transform/transform_constraints.h b/source/blender/editors/transform/transform_constraints.h index 9182330b729..90a693b089e 100644 --- a/source/blender/editors/transform/transform_constraints.h +++ b/source/blender/editors/transform/transform_constraints.h @@ -34,7 +34,7 @@ void setLocalConstraint(TransInfo *t, int mode, const char text[]); * `ftext` is a format string passed to #BLI_snprintf. It will add the name of * the orientation where %s is (logically). */ -void setUserConstraint(TransInfo *t, int mode, const char text[]); +void setUserConstraint(TransInfo *t, int mode, const char text_[]); void drawConstraint(TransInfo *t); /** * Called from drawview.c, as an extra per-window draw option. diff --git a/source/blender/gpu/GPU_compute.h b/source/blender/gpu/GPU_compute.h index 6dfd6f73ae8..ff94620f186 100644 --- a/source/blender/gpu/GPU_compute.h +++ b/source/blender/gpu/GPU_compute.h @@ -20,7 +20,7 @@ void GPU_compute_dispatch(GPUShader *shader, uint groups_y_len, uint groups_z_len); -void GPU_compute_dispatch_indirect(GPUShader *shader, GPUStorageBuf *indirect_buf); +void GPU_compute_dispatch_indirect(GPUShader *shader, GPUStorageBuf *indirect_buf_); #ifdef __cplusplus } diff --git a/source/blender/gpu/intern/gpu_immediate_util.c b/source/blender/gpu/intern/gpu_immediate_util.c index 5233ff2dbf6..9713a854acc 100644 --- a/source/blender/gpu/intern/gpu_immediate_util.c +++ b/source/blender/gpu/intern/gpu_immediate_util.c @@ -239,9 +239,9 @@ void imm_draw_circle_partial_wire_2d( } void imm_draw_circle_partial_wire_3d( - uint pos, float x, float y, float z, float rad, int nsegments, float start, float sweep) + uint pos, float x, float y, float z, float radius, int nsegments, float start, float sweep) { - imm_draw_circle_partial_3d(GPU_PRIM_LINE_STRIP, pos, x, y, z, rad, nsegments, start, sweep); + imm_draw_circle_partial_3d(GPU_PRIM_LINE_STRIP, pos, x, y, z, radius, nsegments, start, sweep); } static void imm_draw_disk_partial(GPUPrimType prim_type, diff --git a/source/blender/io/common/IO_abstract_hierarchy_iterator.h b/source/blender/io/common/IO_abstract_hierarchy_iterator.h index a67cfe6a9d6..966eb640264 100644 --- a/source/blender/io/common/IO_abstract_hierarchy_iterator.h +++ b/source/blender/io/common/IO_abstract_hierarchy_iterator.h @@ -228,7 +228,7 @@ class AbstractHierarchyIterator { * writer is created it will also write the current iteration, to ensure the hierarchy is * complete. The `export_subset` option is only in effect when the writer already existed from a * previous iteration. */ - void set_export_subset(ExportSubset export_subset_); + void set_export_subset(ExportSubset export_subset); /* Convert the given name to something that is valid for the exported file format. * This base implementation is a no-op; override in a concrete subclass. */ @@ -267,7 +267,7 @@ class AbstractHierarchyIterator { /* These three functions create writers and call their write() method. */ void make_writers(const HierarchyContext *parent_context); void make_writer_object_data(const HierarchyContext *context); - void make_writers_particle_systems(const HierarchyContext *context); + void make_writers_particle_systems(const HierarchyContext *transform_context); /* Return the appropriate HierarchyContext for the data of the object represented by * object_context. */ @@ -332,7 +332,7 @@ class AbstractHierarchyIterator { virtual void release_writer(AbstractHierarchyWriter *writer) = 0; AbstractHierarchyWriter *get_writer(const std::string &export_path) const; - ExportChildren &graph_children(const HierarchyContext *parent_context); + ExportChildren &graph_children(const HierarchyContext *context); }; } // namespace blender::io diff --git a/source/blender/modifiers/intern/MOD_meshcache_util.h b/source/blender/modifiers/intern/MOD_meshcache_util.h index 276bdf72bc3..2726f2d7efb 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_util.h +++ b/source/blender/modifiers/intern/MOD_meshcache_util.h @@ -8,12 +8,8 @@ /* MOD_meshcache_mdd.c */ -bool MOD_meshcache_read_mdd_index(FILE *fp, - float (*vertexCos)[3], - int vertex_tot, - int index, - float factor, - const char **err_str); +bool MOD_meshcache_read_mdd_index( + FILE *fp, float (*vertexCos)[3], int verts_tot, int index, float factor, const char **err_str); bool MOD_meshcache_read_mdd_frame(FILE *fp, float (*vertexCos)[3], int verts_tot, diff --git a/source/blender/render/intern/texture_common.h b/source/blender/render/intern/texture_common.h index 0057779bda6..028b3d22f01 100644 --- a/source/blender/render/intern/texture_common.h +++ b/source/blender/render/intern/texture_common.h @@ -73,8 +73,8 @@ int imagewraposa(struct Tex *tex, struct Image *ima, struct ImBuf *ibuf, const float texvec[3], - const float dxt[2], - const float dyt[2], + const float DXT[2], + const float DYT[2], struct TexResult *texres, struct ImagePool *pool, bool skip_load_image); diff --git a/source/blender/sequencer/SEQ_relations.h b/source/blender/sequencer/SEQ_relations.h index 9678ac1cc1c..1b8d9db347d 100644 --- a/source/blender/sequencer/SEQ_relations.h +++ b/source/blender/sequencer/SEQ_relations.h @@ -31,7 +31,7 @@ bool SEQ_relations_check_scene_recursion(struct Scene *scene, struct ReportList * Check if "seq_main" (indirectly) uses strip "seq". */ bool SEQ_relations_render_loop_check(struct Sequence *seq_main, struct Sequence *seq); -void SEQ_relations_free_imbuf(struct Scene *scene, struct ListBase *seqbasep, bool for_render); +void SEQ_relations_free_imbuf(struct Scene *scene, struct ListBase *seqbase, bool for_render); void SEQ_relations_invalidate_cache_raw(struct Scene *scene, struct Sequence *seq); void SEQ_relations_invalidate_cache_preprocessed(struct Scene *scene, struct Sequence *seq); void SEQ_relations_invalidate_cache_composite(struct Scene *scene, struct Sequence *seq); diff --git a/source/blender/sequencer/SEQ_transform.h b/source/blender/sequencer/SEQ_transform.h index 8bc7733861c..c27a9dc4409 100644 --- a/source/blender/sequencer/SEQ_transform.h +++ b/source/blender/sequencer/SEQ_transform.h @@ -30,7 +30,7 @@ bool SEQ_transform_test_overlap(const struct Scene *scene, bool SEQ_transform_test_overlap_seq_seq(const struct Scene *scene, struct Sequence *seq1, struct Sequence *seq2); -void SEQ_transform_translate_sequence(struct Scene *scene, struct Sequence *seq, int delta); +void SEQ_transform_translate_sequence(struct Scene *evil_scene, struct Sequence *seq, int delta); /** * \return 0 if there weren't enough space. */