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/render
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/render')
-rw-r--r--source/blender/render/RE_bake.h26
-rw-r--r--source/blender/render/RE_engine.h8
-rw-r--r--source/blender/render/RE_pipeline.h16
-rw-r--r--source/blender/render/RE_texture.h16
-rw-r--r--source/blender/render/intern/render_result.h8
-rw-r--r--source/blender/render/intern/texture_common.h4
6 files changed, 39 insertions, 39 deletions
diff --git a/source/blender/render/RE_bake.h b/source/blender/render/RE_bake.h
index b2c44e051d1..43d3b5b323c 100644
--- a/source/blender/render/RE_bake.h
+++ b/source/blender/render/RE_bake.h
@@ -81,25 +81,25 @@ bool RE_bake_has_engine(const struct Render *re);
bool RE_bake_engine(struct Render *re,
struct Depsgraph *depsgraph,
struct Object *object,
- const int object_id,
+ int object_id,
const BakePixel pixel_array[],
const BakeTargets *targets,
- const eScenePassType pass_type,
- const int pass_filter,
+ eScenePassType pass_type,
+ int pass_filter,
float result[]);
/* bake.c */
-int RE_pass_depth(const eScenePassType pass_type);
+int RE_pass_depth(eScenePassType pass_type);
bool RE_bake_pixels_populate_from_objects(struct Mesh *me_low,
BakePixel pixel_array_from[],
BakePixel pixel_array_to[],
BakeHighPolyData highpoly[],
- const int tot_highpoly,
+ int tot_highpoly,
const size_t num_pixels,
- const bool is_custom_cage,
- const float cage_extrusion,
- const float max_ray_distance,
+ bool is_custom_cage,
+ float cage_extrusion,
+ float max_ray_distance,
float mat_low[4][4],
float mat_cage[4][4],
struct Mesh *me_cage);
@@ -112,11 +112,11 @@ void RE_bake_pixels_populate(struct Mesh *me,
void RE_bake_mask_fill(const BakePixel pixel_array[], const size_t num_pixels, char *mask);
-void RE_bake_margin(struct ImBuf *ibuf, char *mask, const int margin);
+void RE_bake_margin(struct ImBuf *ibuf, char *mask, int margin);
void RE_bake_normal_world_to_object(const BakePixel pixel_array[],
const size_t num_pixels,
- const int depth,
+ int depth,
float result[],
struct Object *ob,
const eBakeNormalSwizzle normal_swizzle[3]);
@@ -126,18 +126,18 @@ void RE_bake_normal_world_to_object(const BakePixel pixel_array[],
*/
void RE_bake_normal_world_to_tangent(const BakePixel pixel_array[],
const size_t num_pixels,
- const int depth,
+ int depth,
float result[],
struct Mesh *me,
const eBakeNormalSwizzle normal_swizzle[3],
float mat[4][4]);
void RE_bake_normal_world_to_world(const BakePixel pixel_array[],
const size_t num_pixels,
- const int depth,
+ int depth,
float result[],
const eBakeNormalSwizzle normal_swizzle[3]);
-void RE_bake_ibuf_clear(struct Image *image, const bool is_tangent);
+void RE_bake_ibuf_clear(struct Image *image, bool is_tangent);
#ifdef __cplusplus
}
diff --git a/source/blender/render/RE_engine.h b/source/blender/render/RE_engine.h
index b22d263490c..c0bd8c0fe4e 100644
--- a/source/blender/render/RE_engine.h
+++ b/source/blender/render/RE_engine.h
@@ -106,10 +106,10 @@ typedef struct RenderEngineType {
void (*bake)(struct RenderEngine *engine,
struct Depsgraph *depsgraph,
struct Object *object,
- const int pass_type,
- const int pass_filter,
- const int width,
- const int height);
+ int pass_type,
+ int pass_filter,
+ int width,
+ int height);
void (*view_update)(struct RenderEngine *engine,
const struct bContext *context,
diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h
index bf7d41b97b2..072fc7363b2 100644
--- a/source/blender/render/RE_pipeline.h
+++ b/source/blender/render/RE_pipeline.h
@@ -237,7 +237,7 @@ void RE_ReleaseResultImageViews(struct Render *re, struct RenderResult *rr);
* This #RenderResult struct is the only exception to the rule of a #RenderResult
* always having at least one #RenderView.
*/
-void RE_AcquireResultImage(struct Render *re, struct RenderResult *rr, const int view_id);
+void RE_AcquireResultImage(struct Render *re, struct RenderResult *rr, int view_id);
void RE_ReleaseResultImage(struct Render *re);
void RE_SwapResult(struct Render *re, struct RenderResult **rr);
void RE_ClearResult(struct Render *re);
@@ -255,12 +255,12 @@ void RE_ResultGet32(struct Render *re, unsigned int *rect);
void RE_AcquiredResultGet32(struct Render *re,
struct RenderResult *result,
unsigned int *rect,
- const int view_id);
+ int view_id);
void RE_render_result_rect_from_ibuf(struct RenderResult *rr,
struct RenderData *rd,
struct ImBuf *ibuf,
- const int view_id);
+ int view_id);
struct RenderLayer *RE_GetRenderLayer(struct RenderResult *rr, const char *name);
float *RE_RenderLayerGetPass(volatile struct RenderLayer *rl,
@@ -283,7 +283,7 @@ void RE_create_render_pass(struct RenderResult *rr,
const char *chan_id,
const char *layername,
const char *viewname,
- const bool allocate);
+ bool allocate);
/**
* Obligatory initialize call, doesn't change during entire render sequence.
@@ -325,7 +325,7 @@ void RE_init_threadcount(Render *re);
bool RE_WriteRenderViewsImage(struct ReportList *reports,
struct RenderResult *rr,
struct Scene *scene,
- const bool stamp,
+ bool stamp,
char *name);
bool RE_WriteRenderViewsMovie(struct ReportList *reports,
struct RenderResult *rr,
@@ -333,7 +333,7 @@ bool RE_WriteRenderViewsMovie(struct ReportList *reports,
struct RenderData *rd,
struct bMovieHandle *mh,
void **movie_ctx_arr,
- const int totvideos,
+ int totvideos,
bool preview);
/**
@@ -347,7 +347,7 @@ void RE_RenderFrame(struct Render *re,
struct ViewLayer *single_layer,
struct Object *camera_override,
int frame,
- const bool write_still);
+ bool write_still);
/**
* Saves images to disk.
*/
@@ -476,7 +476,7 @@ bool RE_allow_render_generic_object(struct Object *ob);
bool RE_HasCombinedLayer(RenderResult *res);
bool RE_HasFloatPixels(RenderResult *res);
bool RE_RenderResult_is_stereo(RenderResult *res);
-struct RenderView *RE_RenderViewGetById(struct RenderResult *rr, const int view_id);
+struct RenderView *RE_RenderViewGetById(struct RenderResult *rr, int view_id);
struct RenderView *RE_RenderViewGetByName(struct RenderResult *rr, const char *viewname);
RenderResult *RE_DuplicateRenderResult(RenderResult *rr);
diff --git a/source/blender/render/RE_texture.h b/source/blender/render/RE_texture.h
index cb18dc92415..d71c793f300 100644
--- a/source/blender/render/RE_texture.h
+++ b/source/blender/render/RE_texture.h
@@ -45,10 +45,10 @@ extern "C" {
*/
bool RE_texture_evaluate(const struct MTex *mtex,
const float vec[3],
- const int thread,
+ int thread,
struct ImagePool *pool,
- const bool skip_load_image,
- const bool texnode_preview,
+ bool skip_load_image,
+ bool texnode_preview,
/* Return arguments. */
float *r_intensity,
float r_rgba[4]) ATTR_NONNULL(1, 2, 7, 8);
@@ -88,7 +88,7 @@ void RE_point_density_minmax(struct Depsgraph *depsgraph,
*/
void RE_point_density_sample(struct Depsgraph *depsgraph,
struct PointDensity *pd,
- const int resolution,
+ int resolution,
float *values);
void RE_point_density_free(struct PointDensity *pd);
@@ -122,10 +122,10 @@ int multitex_ext(struct Tex *tex,
float dyt[3],
int osatex,
struct TexResult *texres,
- const short thread,
+ short thread,
struct ImagePool *pool,
bool scene_color_manage,
- const bool skip_load_image);
+ bool skip_load_image);
/**
* Nodes disabled.
@@ -138,7 +138,7 @@ int multitex_ext_safe(struct Tex *tex,
struct TexResult *texres,
struct ImagePool *pool,
bool scene_color_manage,
- const bool skip_load_image);
+ bool skip_load_image);
/**
* Only for internal node usage.
@@ -152,7 +152,7 @@ int multitex_nodes(struct Tex *tex,
float dyt[3],
int osatex,
struct TexResult *texres,
- const short thread,
+ short thread,
short which_output,
struct MTex *mtex,
struct ImagePool *pool);
diff --git a/source/blender/render/intern/render_result.h b/source/blender/render/intern/render_result.h
index ede0a0d21ea..9084dbf95ce 100644
--- a/source/blender/render/intern/render_result.h
+++ b/source/blender/render/intern/render_result.h
@@ -107,7 +107,7 @@ struct RenderPass *render_layer_add_pass(struct RenderResult *rr,
const char *name,
const char *viewname,
const char *chan_id,
- const bool allocate);
+ bool allocate);
/**
* Called for reading temp files, and for external engines.
@@ -128,16 +128,16 @@ bool render_result_exr_file_cache_read(struct Render *re);
struct ImBuf *render_result_rect_to_ibuf(struct RenderResult *rr,
const struct RenderData *rd,
- const int view_id);
+ int view_id);
-void render_result_rect_fill_zero(struct RenderResult *rr, const int view_id);
+void render_result_rect_fill_zero(struct RenderResult *rr, int view_id);
void render_result_rect_get_pixels(struct RenderResult *rr,
unsigned int *rect,
int rectx,
int recty,
const struct ColorManagedViewSettings *view_settings,
const struct ColorManagedDisplaySettings *display_settings,
- const int view_id);
+ int view_id);
/**
* Create a new views #ListBase in rr without duplicating the memory pointers.
diff --git a/source/blender/render/intern/texture_common.h b/source/blender/render/intern/texture_common.h
index b3a976c3fe0..5fc3af6153f 100644
--- a/source/blender/render/intern/texture_common.h
+++ b/source/blender/render/intern/texture_common.h
@@ -89,13 +89,13 @@ int imagewraposa(struct Tex *tex,
const float dyt[2],
struct TexResult *texres,
struct ImagePool *pool,
- const bool skip_load_image);
+ bool skip_load_image);
int imagewrap(struct Tex *tex,
struct Image *ima,
const float texvec[3],
struct TexResult *texres,
struct ImagePool *pool,
- const bool skip_load_image);
+ bool skip_load_image);
void image_sample(struct Image *ima,
float fx,
float fy,