From aa2164da336082248ab452875f673e175c0448fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Thu, 27 Jan 2022 15:25:01 +0100 Subject: Cleanup: Fix const correctness warning --- source/blender/draw/intern/draw_manager_data.c | 2 +- source/blender/draw/intern/draw_manager_exec.c | 2 +- source/blender/draw/intern/draw_manager_shader.c | 2 +- source/blender/render/RE_pipeline.h | 2 +- source/blender/render/intern/initrender.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index 1ab211dfcfd..a4d5d6f3c31 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -1907,7 +1907,7 @@ void DRW_view_reset(void) void DRW_view_default_set(const DRWView *view) { BLI_assert(DST.view_default == NULL); - DST.view_default = view; + DST.view_default = (DRWView *)view; } void DRW_view_clip_planes_set(DRWView *view, float (*planes)[4], int plane_len) diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 8d79111b763..2095a8483d6 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -356,7 +356,7 @@ static bool draw_call_is_culled(const DRWResourceHandle *handle, DRWView *view) void DRW_view_set_active(const DRWView *view) { - DST.view_active = (view) ? view : DST.view_default; + DST.view_active = (view != NULL) ? ((DRWView *)view) : DST.view_default; } const DRWView *DRW_view_get_active(void) diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c index d7081c1ffb7..f8e64041a92 100644 --- a/source/blender/draw/intern/draw_manager_shader.c +++ b/source/blender/draw/intern/draw_manager_shader.c @@ -567,7 +567,7 @@ void DRW_shader_free(GPUShader *shader) #define MAX_LIB_DEPS 8 struct DRWShaderLibrary { - char *libs[MAX_LIB]; + const char *libs[MAX_LIB]; char libs_name[MAX_LIB][MAX_LIB_NAME]; uint32_t libs_deps[MAX_LIB]; }; diff --git a/source/blender/render/RE_pipeline.h b/source/blender/render/RE_pipeline.h index 25384ff558c..c1392b24023 100644 --- a/source/blender/render/RE_pipeline.h +++ b/source/blender/render/RE_pipeline.h @@ -310,7 +310,7 @@ void RE_SetOverrideCamera(struct Render *re, struct Object *cam_ob); * * \note call this after #RE_InitState(). */ -void RE_SetCamera(struct Render *re, struct Object *cam_ob); +void RE_SetCamera(struct Render *re, const struct Object *cam_ob); /** * Get current view and window transform. diff --git a/source/blender/render/intern/initrender.c b/source/blender/render/intern/initrender.c index 0ceb0e61a0e..3bdf60c13a2 100644 --- a/source/blender/render/intern/initrender.c +++ b/source/blender/render/intern/initrender.c @@ -174,7 +174,7 @@ void RE_SetOverrideCamera(Render *re, Object *cam_ob) re->camera_override = cam_ob; } -void RE_SetCamera(Render *re, Object *cam_ob) +void RE_SetCamera(Render *re, const Object *cam_ob) { CameraParams params; -- cgit v1.2.3