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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-03-13 09:27:11 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-03-13 09:27:11 +0300
commit1f0b21e713b00ed56e5a7606b9fd8c719ff3b3bb (patch)
tree889e4c1ca0ae57c9857ba368d8f34ba73a61e2c2 /source
parentfa823f0af8675be076c1a43c09b56dfa0f27010d (diff)
Cleanup: pass const args (mostly Scene & RenderData)
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/BKE_camera.h19
-rw-r--r--source/blender/blenkernel/BKE_image.h2
-rw-r--r--source/blender/blenkernel/BKE_scene.h6
-rw-r--r--source/blender/blenkernel/BKE_sequencer.h2
-rw-r--r--source/blender/blenkernel/BKE_sound.h5
-rw-r--r--source/blender/blenkernel/BKE_writeavi.h12
-rw-r--r--source/blender/blenkernel/BKE_writeffmpeg.h6
-rw-r--r--source/blender/blenkernel/intern/camera.c25
-rw-r--r--source/blender/blenkernel/intern/image.c6
-rw-r--r--source/blender/blenkernel/intern/scene.c12
-rw-r--r--source/blender/blenkernel/intern/sequencer.c6
-rw-r--r--source/blender/blenkernel/intern/sound.c4
-rw-r--r--source/blender/blenkernel/intern/writeavi.c12
-rw-r--r--source/blender/blenkernel/intern/writeffmpeg.c17
-rw-r--r--source/blender/draw/engines/eevee/eevee_private.h2
-rw-r--r--source/blender/draw/engines/external/external_engine.c2
-rw-r--r--source/blender/draw/intern/draw_manager.c2
-rw-r--r--source/blender/editors/animation/keyframing.c2
-rw-r--r--source/blender/editors/animation/keyingsets.c4
-rw-r--r--source/blender/editors/include/ED_keyframing.h6
-rw-r--r--source/blender/editors/include/ED_view3d.h16
-rw-r--r--source/blender/editors/include/ED_view3d_offscreen.h2
-rw-r--r--source/blender/editors/space_node/node_edit.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_camera_control.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c23
-rw-r--r--source/blender/editors/space_view3d/view3d_intern.h2
-rw-r--r--source/blender/editors/space_view3d/view3d_utils.c7
-rw-r--r--source/blender/editors/space_view3d/view3d_view.c2
-rw-r--r--source/blender/render/extern/include/RE_engine.h2
-rw-r--r--source/blender/render/intern/include/render_result.h4
-rw-r--r--source/blender/render/intern/source/external_engine.c2
-rw-r--r--source/blender/render/intern/source/render_result.c4
32 files changed, 120 insertions, 100 deletions
diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h
index aebe04f3a7a..f93003dc423 100644
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@@ -117,7 +117,7 @@ void BKE_camera_view_frame(const struct Scene *scene,
float r_vec[4][3]);
bool BKE_camera_view_frame_fit_to_scene(struct Depsgraph *depsgraph,
- struct Scene *scene,
+ const struct Scene *scene,
struct Object *camera_ob,
float r_co[3],
float *r_scale);
@@ -130,33 +130,34 @@ bool BKE_camera_view_frame_fit_to_coords(const struct Depsgraph *depsgraph,
/* Camera multi-view API */
-struct Object *BKE_camera_multiview_render(struct Scene *scene,
+struct Object *BKE_camera_multiview_render(const struct Scene *scene,
struct Object *camera,
const char *viewname);
-void BKE_camera_multiview_view_matrix(struct RenderData *rd,
+void BKE_camera_multiview_view_matrix(const struct RenderData *rd,
const struct Object *camera,
const bool is_left,
float r_viewmat[4][4]);
-void BKE_camera_multiview_model_matrix(struct RenderData *rd,
+void BKE_camera_multiview_model_matrix(const struct RenderData *rd,
const struct Object *camera,
const char *viewname,
float r_modelmat[4][4]);
-void BKE_camera_multiview_model_matrix_scaled(struct RenderData *rd,
+void BKE_camera_multiview_model_matrix_scaled(const struct RenderData *rd,
const struct Object *camera,
const char *viewname,
float r_modelmat[4][4]);
-void BKE_camera_multiview_window_matrix(struct RenderData *rd,
+void BKE_camera_multiview_window_matrix(const struct RenderData *rd,
const struct Object *camera,
const char *viewname,
float r_winmat[4][4]);
-float BKE_camera_multiview_shift_x(struct RenderData *rd,
+float BKE_camera_multiview_shift_x(const struct RenderData *rd,
const struct Object *camera,
const char *viewname);
-void BKE_camera_multiview_params(struct RenderData *rd,
+void BKE_camera_multiview_params(const struct RenderData *rd,
struct CameraParams *params,
const struct Object *camera,
const char *viewname);
-bool BKE_camera_multiview_spherical_stereo(struct RenderData *rd, const struct Object *camera);
+bool BKE_camera_multiview_spherical_stereo(const struct RenderData *rd,
+ const struct Object *camera);
/* Camera background image API */
struct CameraBGImage *BKE_camera_background_image_new(struct Camera *cam);
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index 524bd3318f6..4ce740a1f5a 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -68,7 +68,7 @@ void BKE_render_result_stamp_info(struct Scene *scene,
* Fills in the static stamp data (i.e. everything except things that can change per frame).
* The caller is responsible for freeing the allocated memory.
*/
-struct StampData *BKE_stamp_info_from_scene_static(struct Scene *scene);
+struct StampData *BKE_stamp_info_from_scene_static(const struct Scene *scene);
bool BKE_stamp_is_known_field(const char *field_name);
void BKE_imbuf_stamp_info(struct RenderResult *rr, struct ImBuf *ibuf);
void BKE_stamp_info_from_imbuf(struct RenderResult *rr, struct ImBuf *ibuf);
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index 8018178fcee..f78c7b66bb4 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -78,7 +78,7 @@ void BKE_scene_remove_rigidbody_object(struct Main *bmain,
const bool free_us);
bool BKE_scene_object_find(struct Scene *scene, struct Object *ob);
-struct Object *BKE_scene_object_find_by_name(struct Scene *scene, const char *name);
+struct Object *BKE_scene_object_find_by_name(const struct Scene *scene, const char *name);
/* Scene base iteration function.
* Define struct here, so no need to bother with alloc/free it.
@@ -118,8 +118,8 @@ struct Object *BKE_scene_camera_switch_find(struct Scene *scene); // DURIAN_CAM
#endif
bool BKE_scene_camera_switch_update(struct Scene *scene);
-char *BKE_scene_find_marker_name(struct Scene *scene, int frame);
-char *BKE_scene_find_last_marker_name(struct Scene *scene, int frame);
+const char *BKE_scene_find_marker_name(const struct Scene *scene, int frame);
+const char *BKE_scene_find_last_marker_name(const struct Scene *scene, int frame);
int BKE_scene_frame_snap_by_seconds(struct Scene *scene, double interval_in_seconds, int cfra);
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index 2a45d89bad4..31951cc101a 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -393,7 +393,7 @@ void BKE_sequence_single_fix(struct Sequence *seq);
bool BKE_sequence_test_overlap(struct ListBase *seqbasep, struct Sequence *test);
void BKE_sequence_translate(struct Scene *scene, struct Sequence *seq, int delta);
void BKE_sequence_sound_init(struct Scene *scene, struct Sequence *seq);
-struct Sequence *BKE_sequencer_foreground_frame_get(struct Scene *scene, int frame);
+const struct Sequence *BKE_sequencer_foreground_frame_get(const struct Scene *scene, int frame);
struct ListBase *BKE_sequence_seqbase(struct ListBase *seqbase, struct Sequence *seq);
struct Sequence *BKE_sequence_metastrip(ListBase *seqbase /* = ed->seqbase */,
struct Sequence *meta /* = NULL */,
diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h
index e6d931276bf..1298f25fcc4 100644
--- a/source/blender/blenkernel/BKE_sound.h
+++ b/source/blender/blenkernel/BKE_sound.h
@@ -105,7 +105,10 @@ typedef struct SoundInfo {
bool BKE_sound_info_get(struct Main *main, struct bSound *sound, SoundInfo *sound_info);
#if defined(WITH_AUDASPACE)
-AUD_Device *BKE_sound_mixdown(struct Scene *scene, AUD_DeviceSpecs specs, int start, float volume);
+AUD_Device *BKE_sound_mixdown(const struct Scene *scene,
+ AUD_DeviceSpecs specs,
+ int start,
+ float volume);
#endif
void BKE_sound_reset_scene_runtime(struct Scene *scene);
diff --git a/source/blender/blenkernel/BKE_writeavi.h b/source/blender/blenkernel/BKE_writeavi.h
index 7fc740a4a9b..79605e99306 100644
--- a/source/blender/blenkernel/BKE_writeavi.h
+++ b/source/blender/blenkernel/BKE_writeavi.h
@@ -36,7 +36,7 @@ struct Scene;
typedef struct bMovieHandle {
int (*start_movie)(void *context_v,
- struct Scene *scene,
+ const struct Scene *scene,
struct RenderData *rd,
int rectx,
int recty,
@@ -55,14 +55,20 @@ typedef struct bMovieHandle {
void (*end_movie)(void *context_v);
/* Optional function. */
- void (*get_movie_path)(char *string, struct RenderData *rd, bool preview, const char *suffix);
+ void (*get_movie_path)(char *string,
+ const struct RenderData *rd,
+ bool preview,
+ const char *suffix);
void *(*context_create)(void);
void (*context_free)(void *context_v);
} bMovieHandle;
bMovieHandle *BKE_movie_handle_get(const char imtype);
-void BKE_movie_filepath_get(char *string, struct RenderData *rd, bool preview, const char *suffix);
+void BKE_movie_filepath_get(char *string,
+ const struct RenderData *rd,
+ bool preview,
+ const char *suffix);
#ifdef __cplusplus
}
diff --git a/source/blender/blenkernel/BKE_writeffmpeg.h b/source/blender/blenkernel/BKE_writeffmpeg.h
index 9da28c849d9..467e6ab7242 100644
--- a/source/blender/blenkernel/BKE_writeffmpeg.h
+++ b/source/blender/blenkernel/BKE_writeffmpeg.h
@@ -62,7 +62,7 @@ struct ReportList;
struct Scene;
int BKE_ffmpeg_start(void *context_v,
- struct Scene *scene,
+ const struct Scene *scene,
struct RenderData *rd,
int rectx,
int recty,
@@ -80,14 +80,14 @@ int BKE_ffmpeg_append(void *context_v,
const char *suffix,
struct ReportList *reports);
void BKE_ffmpeg_filepath_get(char *string,
- struct RenderData *rd,
+ const struct RenderData *rd,
bool preview,
const char *suffix);
void BKE_ffmpeg_preset_set(struct RenderData *rd, int preset);
void BKE_ffmpeg_image_type_verify(struct RenderData *rd, struct ImageFormatData *imf);
void BKE_ffmpeg_codec_settings_verify(struct RenderData *rd);
-bool BKE_ffmpeg_alpha_channel_is_supported(struct RenderData *rd);
+bool BKE_ffmpeg_alpha_channel_is_supported(const struct RenderData *rd);
int BKE_ffmpeg_property_add_string(struct RenderData *rd, const char *type, const char *str);
void BKE_ffmpeg_property_del(struct RenderData *rd, void *type, void *prop_);
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index d1a6ebb222c..1a2d8290609 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -666,7 +666,7 @@ static bool camera_frame_fit_calc_from_data(CameraParams *params,
/* don't move the camera, just yield the fit location */
/* r_scale only valid/useful for ortho cameras */
bool BKE_camera_view_frame_fit_to_scene(
- Depsgraph *depsgraph, Scene *scene, Object *camera_ob, float r_co[3], float *r_scale)
+ Depsgraph *depsgraph, const Scene *scene, Object *camera_ob, float r_co[3], float *r_scale)
{
CameraParams params;
CameraViewFrameData data_cb;
@@ -813,7 +813,7 @@ static void camera_stereo3d_model_matrix(const Object *camera,
}
/* the view matrix is used by the viewport drawing, it is basically the inverted model matrix */
-void BKE_camera_multiview_view_matrix(RenderData *rd,
+void BKE_camera_multiview_view_matrix(const RenderData *rd,
const Object *camera,
const bool is_left,
float r_viewmat[4][4])
@@ -832,7 +832,7 @@ static bool camera_is_left(const char *viewname)
return true;
}
-void BKE_camera_multiview_model_matrix(RenderData *rd,
+void BKE_camera_multiview_model_matrix(const RenderData *rd,
const Object *camera,
const char *viewname,
float r_modelmat[4][4])
@@ -841,7 +841,7 @@ void BKE_camera_multiview_model_matrix(RenderData *rd,
normalize_m4(r_modelmat);
}
-void BKE_camera_multiview_model_matrix_scaled(RenderData *rd,
+void BKE_camera_multiview_model_matrix_scaled(const RenderData *rd,
const Object *camera,
const char *viewname,
float r_modelmat[4][4])
@@ -860,7 +860,7 @@ void BKE_camera_multiview_model_matrix_scaled(RenderData *rd,
}
}
-void BKE_camera_multiview_window_matrix(RenderData *rd,
+void BKE_camera_multiview_window_matrix(const RenderData *rd,
const Object *camera,
const char *viewname,
float r_winmat[4][4])
@@ -879,7 +879,7 @@ void BKE_camera_multiview_window_matrix(RenderData *rd,
copy_m4_m4(r_winmat, params.winmat);
}
-bool BKE_camera_multiview_spherical_stereo(RenderData *rd, const Object *camera)
+bool BKE_camera_multiview_spherical_stereo(const RenderData *rd, const Object *camera)
{
Camera *cam;
const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW) != 0;
@@ -903,9 +903,8 @@ bool BKE_camera_multiview_spherical_stereo(RenderData *rd, const Object *camera)
return false;
}
-static Object *camera_multiview_advanced(Scene *scene, Object *camera, const char *suffix)
+static Object *camera_multiview_advanced(const Scene *scene, Object *camera, const char *suffix)
{
- SceneRenderView *srv;
char name[MAX_NAME];
const char *camera_name = camera->id.name + 2;
const int len_name = strlen(camera_name);
@@ -914,7 +913,7 @@ static Object *camera_multiview_advanced(Scene *scene, Object *camera, const cha
name[0] = '\0';
/* we need to take the better match, thus the len_suffix_max test */
- for (srv = scene->r.views.first; srv; srv = srv->next) {
+ for (const SceneRenderView *srv = scene->r.views.first; srv; srv = srv->next) {
const int len_suffix = strlen(srv->suffix);
if ((len_suffix < len_suffix_max) || (len_name < len_suffix)) {
@@ -938,7 +937,7 @@ static Object *camera_multiview_advanced(Scene *scene, Object *camera, const cha
}
/* returns the camera to be used for render */
-Object *BKE_camera_multiview_render(Scene *scene, Object *camera, const char *viewname)
+Object *BKE_camera_multiview_render(const Scene *scene, Object *camera, const char *viewname)
{
const bool is_multiview = (camera != NULL) && (scene->r.scemode & R_MULTIVIEW) != 0;
@@ -993,7 +992,9 @@ static float camera_stereo3d_shift_x(const Object *camera, const char *viewname)
return shift;
}
-float BKE_camera_multiview_shift_x(RenderData *rd, const Object *camera, const char *viewname)
+float BKE_camera_multiview_shift_x(const RenderData *rd,
+ const Object *camera,
+ const char *viewname)
{
const bool is_multiview = (rd && rd->scemode & R_MULTIVIEW) != 0;
Camera *data = camera->data;
@@ -1011,7 +1012,7 @@ float BKE_camera_multiview_shift_x(RenderData *rd, const Object *camera, const c
}
}
-void BKE_camera_multiview_params(RenderData *rd,
+void BKE_camera_multiview_params(const RenderData *rd,
CameraParams *params,
const Object *camera,
const char *viewname)
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 4220408749a..37e05977450 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -1813,7 +1813,7 @@ typedef struct StampData {
* \param use_dynamic: Also include data that can change on a per-frame basis.
*/
static void stampdata(
- Scene *scene, Object *camera, StampData *stamp_data, int do_prefix, bool use_dynamic)
+ const Scene *scene, Object *camera, StampData *stamp_data, int do_prefix, bool use_dynamic)
{
char text[256];
struct tm *tl;
@@ -1935,7 +1935,7 @@ static void stampdata(
}
if (use_dynamic && scene->r.stamp & R_STAMP_SEQSTRIP) {
- Sequence *seq = BKE_sequencer_foreground_frame_get(scene, scene->r.cfra);
+ const Sequence *seq = BKE_sequencer_foreground_frame_get(scene, scene->r.cfra);
if (seq) {
STRNCPY(text, seq->name + 2);
@@ -2479,7 +2479,7 @@ void BKE_render_result_stamp_info(Scene *scene,
}
}
-struct StampData *BKE_stamp_info_from_scene_static(Scene *scene)
+struct StampData *BKE_stamp_info_from_scene_static(const Scene *scene)
{
struct StampData *stamp_data;
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 6ca14ec9197..98638b6c865 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -740,7 +740,7 @@ bool BKE_scene_object_find(Scene *scene, Object *ob)
return false;
}
-Object *BKE_scene_object_find_by_name(Scene *scene, const char *name)
+Object *BKE_scene_object_find_by_name(const Scene *scene, const char *name)
{
for (ViewLayer *view_layer = scene->view_layers.first; view_layer;
view_layer = view_layer->next) {
@@ -999,10 +999,10 @@ bool BKE_scene_camera_switch_update(Scene *scene)
return false;
}
-char *BKE_scene_find_marker_name(Scene *scene, int frame)
+const char *BKE_scene_find_marker_name(const Scene *scene, int frame)
{
- ListBase *markers = &scene->markers;
- TimeMarker *m1, *m2;
+ const ListBase *markers = &scene->markers;
+ const TimeMarker *m1, *m2;
/* search through markers for match */
for (m1 = markers->first, m2 = markers->last; m1 && m2; m1 = m1->next, m2 = m2->prev) {
@@ -1024,9 +1024,9 @@ char *BKE_scene_find_marker_name(Scene *scene, int frame)
/* return the current marker for this frame,
* we can have more than 1 marker per frame, this just returns the first :/ */
-char *BKE_scene_find_last_marker_name(Scene *scene, int frame)
+const char *BKE_scene_find_last_marker_name(const Scene *scene, int frame)
{
- TimeMarker *marker, *best_marker = NULL;
+ const TimeMarker *marker, *best_marker = NULL;
int best_frame = -MAXFRAME * 2;
for (marker = scene->markers.first; marker; marker = marker->next) {
if (marker->frame == frame) {
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index ea53726a94d..827cccc6bd6 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -4603,10 +4603,10 @@ void BKE_sequence_sound_init(Scene *scene, Sequence *seq)
}
}
-Sequence *BKE_sequencer_foreground_frame_get(Scene *scene, int frame)
+const Sequence *BKE_sequencer_foreground_frame_get(const Scene *scene, int frame)
{
- Editing *ed = BKE_sequencer_editing_get(scene, false);
- Sequence *seq, *best_seq = NULL;
+ const Editing *ed = scene->ed;
+ const Sequence *seq, *best_seq = NULL;
int best_machine = -1;
if (!ed) {
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index df7597b7f01..47b02654104 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -135,7 +135,7 @@ static int sound_cfra;
static char **audio_device_names = NULL;
#endif
-BLI_INLINE void sound_verify_evaluated_id(ID *id)
+BLI_INLINE void sound_verify_evaluated_id(const ID *id)
{
UNUSED_VARS_NDEBUG(id);
/* This is a bit tricky and not quite reliable, but good enough check.
@@ -504,7 +504,7 @@ void BKE_sound_load(Main *bmain, bSound *sound)
sound_load_audio(bmain, sound, true);
}
-AUD_Device *BKE_sound_mixdown(Scene *scene, AUD_DeviceSpecs specs, int start, float volume)
+AUD_Device *BKE_sound_mixdown(const Scene *scene, AUD_DeviceSpecs specs, int start, float volume)
{
sound_verify_evaluated_id(&scene->id);
return AUD_openMixdownDevice(specs, scene->sound_scene, volume, start / FPS);
diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c
index 19425a0d80b..4635db98514 100644
--- a/source/blender/blenkernel/intern/writeavi.c
+++ b/source/blender/blenkernel/intern/writeavi.c
@@ -43,7 +43,7 @@
/* ********************** general blender movie support ***************************** */
static int start_stub(void *UNUSED(context_v),
- Scene *UNUSED(scene),
+ const Scene *UNUSED(scene),
RenderData *UNUSED(rd),
int UNUSED(rectx),
int UNUSED(recty),
@@ -85,7 +85,7 @@ static void context_free_stub(void *UNUSED(context_v))
/* callbacks */
static int start_avi(void *context_v,
- Scene *scene,
+ const Scene *scene,
RenderData *rd,
int rectx,
int recty,
@@ -102,7 +102,7 @@ static int append_avi(void *context_v,
int recty,
const char *suffix,
ReportList *reports);
-static void filepath_avi(char *string, RenderData *rd, bool preview, const char *suffix);
+static void filepath_avi(char *string, const RenderData *rd, bool preview, const char *suffix);
static void *context_create_avi(void);
static void context_free_avi(void *context_v);
#endif /* WITH_AVI */
@@ -158,7 +158,7 @@ bMovieHandle *BKE_movie_handle_get(const char imtype)
#ifdef WITH_AVI
-static void filepath_avi(char *string, RenderData *rd, bool preview, const char *suffix)
+static void filepath_avi(char *string, const RenderData *rd, bool preview, const char *suffix)
{
int sfra, efra;
@@ -196,7 +196,7 @@ static void filepath_avi(char *string, RenderData *rd, bool preview, const char
}
static int start_avi(void *context_v,
- Scene *UNUSED(scene),
+ const Scene *UNUSED(scene),
RenderData *rd,
int rectx,
int recty,
@@ -316,7 +316,7 @@ static void context_free_avi(void *context_v)
#endif /* WITH_AVI */
/* similar to BKE_image_path_from_imformat() */
-void BKE_movie_filepath_get(char *string, RenderData *rd, bool preview, const char *suffix)
+void BKE_movie_filepath_get(char *string, const RenderData *rd, bool preview, const char *suffix)
{
bMovieHandle *mh = BKE_movie_handle_get(rd->im_format.imtype);
if (mh && mh->get_movie_path) {
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index deb9592b4f9..7e5d99617e4 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -114,8 +114,11 @@ typedef struct FFMpegContext {
static void ffmpeg_dict_set_int(AVDictionary **dict, const char *key, int value);
static void ffmpeg_dict_set_float(AVDictionary **dict, const char *key, float value);
static void ffmpeg_set_expert_options(RenderData *rd);
-static void ffmpeg_filepath_get(
- FFMpegContext *context, char *string, struct RenderData *rd, bool preview, const char *suffix);
+static void ffmpeg_filepath_get(FFMpegContext *context,
+ char *string,
+ const struct RenderData *rd,
+ bool preview,
+ const char *suffix);
/* Delete a picture buffer */
@@ -338,7 +341,7 @@ static const char **get_file_extensions(int format)
/* Write a frame to the output file */
static int write_video_frame(
- FFMpegContext *context, RenderData *rd, int cfra, AVFrame *frame, ReportList *reports)
+ FFMpegContext *context, const RenderData *rd, int cfra, AVFrame *frame, ReportList *reports)
{
int got_output;
int ret, success = 1;
@@ -1217,7 +1220,7 @@ static void flush_ffmpeg(FFMpegContext *context)
/* Get the output filename-- similar to the other output formats */
static void ffmpeg_filepath_get(
- FFMpegContext *context, char *string, RenderData *rd, bool preview, const char *suffix)
+ FFMpegContext *context, char *string, const RenderData *rd, bool preview, const char *suffix)
{
char autosplit[20];
@@ -1282,13 +1285,13 @@ static void ffmpeg_filepath_get(
BLI_path_suffix(string, FILE_MAX, suffix, "");
}
-void BKE_ffmpeg_filepath_get(char *string, RenderData *rd, bool preview, const char *suffix)
+void BKE_ffmpeg_filepath_get(char *string, const RenderData *rd, bool preview, const char *suffix)
{
ffmpeg_filepath_get(NULL, string, rd, preview, suffix);
}
int BKE_ffmpeg_start(void *context_v,
- struct Scene *scene,
+ const struct Scene *scene,
RenderData *rd,
int rectx,
int recty,
@@ -1846,7 +1849,7 @@ void BKE_ffmpeg_codec_settings_verify(RenderData *rd)
ffmpeg_set_expert_options(rd);
}
-bool BKE_ffmpeg_alpha_channel_is_supported(RenderData *rd)
+bool BKE_ffmpeg_alpha_channel_is_supported(const RenderData *rd)
{
int codec = rd->ffcodecdata.codec;
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index 0f084ba306b..52fb8b3cced 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -125,7 +125,7 @@ extern struct DrawEngineType draw_engine_eevee_type;
} \
((void)0)
-BLI_INLINE bool eevee_hdri_preview_overlay_enabled(View3D *v3d)
+BLI_INLINE bool eevee_hdri_preview_overlay_enabled(const View3D *v3d)
{
/* Only show the HDRI Preview in Shading Preview in the Viewport. */
if (v3d == NULL || v3d->shading.type != OB_MATERIAL) {
diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c
index bef49efd3f9..f78826b2980 100644
--- a/source/blender/draw/engines/external/external_engine.c
+++ b/source/blender/draw/engines/external/external_engine.c
@@ -183,7 +183,7 @@ static void external_draw_scene_do(void *vedata)
Scene *scene = draw_ctx->scene;
RegionView3D *rv3d = draw_ctx->rv3d;
ARegion *region = draw_ctx->region;
- RenderEngineType *type;
+ const RenderEngineType *type;
DRW_state_reset_ex(DRW_STATE_DEFAULT & ~DRW_STATE_DEPTH_LESS_EQUAL);
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 9553117c179..71e2d8d9b57 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1120,7 +1120,7 @@ static void use_drw_engine(DrawEngineType *engine)
/* Gather all draw engines needed and store them in DST.enabled_engines
* That also define the rendering order of engines */
-static void drw_engines_enable_from_engine(RenderEngineType *engine_type, eDrawType drawtype)
+static void drw_engines_enable_from_engine(const RenderEngineType *engine_type, eDrawType drawtype)
{
switch (drawtype) {
case OB_WIRE:
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 22a42d56fcd..c290a2ac70a 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -2709,7 +2709,7 @@ void ANIM_OT_keyframe_clear_button(wmOperatorType *ot)
/* ******************************************* */
/* AUTO KEYFRAME */
-bool autokeyframe_cfra_can_key(Scene *scene, ID *id)
+bool autokeyframe_cfra_can_key(const Scene *scene, ID *id)
{
float cfra = (float)CFRA; // XXX for now, this will do
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index 721953f41c8..6f9769f9785 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -673,7 +673,7 @@ bool ANIM_keyingset_find_id(KeyingSet *ks, ID *id)
/* Getters for Active/Indices ----------------------------- */
/* Get the active Keying Set for the Scene provided */
-KeyingSet *ANIM_scene_get_active_keyingset(Scene *scene)
+KeyingSet *ANIM_scene_get_active_keyingset(const Scene *scene)
{
/* if no scene, we've got no hope of finding the Keying Set */
if (scene == NULL) {
@@ -728,7 +728,7 @@ int ANIM_scene_get_keyingset_index(Scene *scene, KeyingSet *ks)
}
/* Get Keying Set to use for Auto-Keyframing some transforms */
-KeyingSet *ANIM_get_keyingset_for_autokeying(Scene *scene, const char *transformKSName)
+KeyingSet *ANIM_get_keyingset_for_autokeying(const Scene *scene, const char *transformKSName)
{
/* get KeyingSet to use
* - use the active KeyingSet if defined (and user wants to use it for all autokeying),
diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.h
index 2f81e28b496..6cac3e60531 100644
--- a/source/blender/editors/include/ED_keyframing.h
+++ b/source/blender/editors/include/ED_keyframing.h
@@ -259,13 +259,13 @@ void ANIM_keyingset_infos_exit(void);
/* -------- */
/* Get the active KeyingSet for the given scene */
-struct KeyingSet *ANIM_scene_get_active_keyingset(struct Scene *scene);
+struct KeyingSet *ANIM_scene_get_active_keyingset(const struct Scene *scene);
/* Get the index of the Keying Set provided, for the given Scene */
int ANIM_scene_get_keyingset_index(struct Scene *scene, struct KeyingSet *ks);
/* Get Keying Set to use for Auto-Keyframing some transforms */
-struct KeyingSet *ANIM_get_keyingset_for_autokeying(struct Scene *scene,
+struct KeyingSet *ANIM_get_keyingset_for_autokeying(const struct Scene *scene,
const char *tranformKSName);
/* Dynamically populate an enum of Keying Sets */
@@ -442,7 +442,7 @@ void ANIM_copy_as_driver(struct ID *target_id, const char *target_path, const ch
(U.autokey_flag & AUTOKEY_FLAG_##flag))
/* auto-keyframing feature - checks for whether anything should be done for the current frame */
-bool autokeyframe_cfra_can_key(struct Scene *scene, struct ID *id);
+bool autokeyframe_cfra_can_key(const struct Scene *scene, struct ID *id);
/* ************ Keyframe Checking ******************** */
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 7b9e4cfe7bf..f882d6be9a2 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -581,7 +581,7 @@ void ED_draw_object_facemap(struct Depsgraph *depsgraph,
const float col[4],
const int facemap);
-struct RenderEngineType *ED_view3d_engine_type(struct Scene *scene, int drawtype);
+struct RenderEngineType *ED_view3d_engine_type(const struct Scene *scene, int drawtype);
bool ED_view3d_context_activate(struct bContext *C);
void ED_view3d_draw_setup_view(struct wmWindow *win,
@@ -598,7 +598,7 @@ struct Object *ED_view3d_give_object_under_cursor(struct bContext *C, const int
bool ED_view3d_is_object_under_cursor(struct bContext *C, const int mval[2]);
void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *region, bool do_clip);
void ED_view3d_update_viewmat(struct Depsgraph *depsgraph,
- struct Scene *scene,
+ const struct Scene *scene,
struct View3D *v3d,
struct ARegion *region,
float viewmat[4][4],
@@ -648,7 +648,7 @@ bool ED_view3d_camera_lock_sync(const struct Depsgraph *depsgraph,
struct View3D *v3d,
struct RegionView3D *rv3d);
-bool ED_view3d_camera_autokey(struct Scene *scene,
+bool ED_view3d_camera_autokey(const struct Scene *scene,
struct ID *id_key,
struct bContext *C,
const bool do_rotate,
@@ -670,9 +670,9 @@ bool ED_view3d_distance_set_from_location(struct RegionView3D *rv3d,
const float dist_co[3],
const float dist_min);
-float ED_scene_grid_scale(struct Scene *scene, const char **grid_unit);
-float ED_view3d_grid_scale(struct Scene *scene, struct View3D *v3d, const char **grid_unit);
-void ED_view3d_grid_steps(struct Scene *scene,
+float ED_scene_grid_scale(const struct Scene *scene, const char **grid_unit);
+float ED_view3d_grid_scale(const struct Scene *scene, struct View3D *v3d, const char **grid_unit);
+void ED_view3d_grid_steps(const struct Scene *scene,
struct View3D *v3d,
struct RegionView3D *rv3d,
float *r_grid_steps);
@@ -681,7 +681,7 @@ float ED_view3d_grid_view_scale(struct Scene *scene,
struct RegionView3D *rv3d,
const char **grid_unit);
-void ED_scene_draw_fps(struct Scene *scene, int xoffset, int *yoffset);
+void ED_scene_draw_fps(const struct Scene *scene, int xoffset, int *yoffset);
/* view matrix properties utilities */
/* unused */
@@ -708,7 +708,7 @@ void ED_view3d_shade_update(struct Main *bmain, struct View3D *v3d, struct ScrAr
/* view3d_draw_legacy.c */
/* Try avoid using these more move out of legacy. */
-void ED_view3d_draw_bgpic_test(struct Scene *scene,
+void ED_view3d_draw_bgpic_test(const struct Scene *scene,
struct Depsgraph *depsgraph,
struct ARegion *region,
struct View3D *v3d,
diff --git a/source/blender/editors/include/ED_view3d_offscreen.h b/source/blender/editors/include/ED_view3d_offscreen.h
index 359c55d89a5..4520f831a08 100644
--- a/source/blender/editors/include/ED_view3d_offscreen.h
+++ b/source/blender/editors/include/ED_view3d_offscreen.h
@@ -43,7 +43,7 @@ struct GPUViewport;
struct View3DShading;
void ED_view3d_draw_offscreen(struct Depsgraph *depsgraph,
- struct Scene *scene,
+ const struct Scene *scene,
eDrawType drawtype,
struct View3D *v3d,
struct ARegion *region,
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 025de1c898c..f679bcc4e15 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -2450,7 +2450,7 @@ void NODE_OT_tree_socket_move(wmOperatorType *ot)
static bool node_shader_script_update_poll(bContext *C)
{
Scene *scene = CTX_data_scene(C);
- RenderEngineType *type = RE_engines_find(scene->r.engine);
+ const RenderEngineType *type = RE_engines_find(scene->r.engine);
SpaceNode *snode = CTX_wm_space_node(C);
bNode *node;
Text *text;
diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c b/source/blender/editors/space_view3d/view3d_camera_control.c
index 260546738f4..d812ed530ce 100644
--- a/source/blender/editors/space_view3d/view3d_camera_control.c
+++ b/source/blender/editors/space_view3d/view3d_camera_control.c
@@ -101,7 +101,7 @@ typedef struct View3DCameraControl {
void *obtfm;
} View3DCameraControl;
-BLI_INLINE Object *view3d_cameracontrol_object(View3DCameraControl *vctrl)
+BLI_INLINE Object *view3d_cameracontrol_object(const View3DCameraControl *vctrl)
{
return vctrl->root_parent ? vctrl->root_parent : vctrl->ctx_v3d->camera;
}
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 4e2aada1e26..4cf5ecfc4f0 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -109,7 +109,7 @@
* \note keep this synced with #ED_view3d_mats_rv3d_backup/#ED_view3d_mats_rv3d_restore
*/
void ED_view3d_update_viewmat(Depsgraph *depsgraph,
- Scene *scene,
+ const Scene *scene,
View3D *v3d,
ARegion *region,
float viewmat[4][4],
@@ -208,7 +208,7 @@ static void view3d_main_region_setup_view(Depsgraph *depsgraph,
}
static void view3d_main_region_setup_offscreen(Depsgraph *depsgraph,
- Scene *scene,
+ const Scene *scene,
View3D *v3d,
ARegion *region,
float viewmat[4][4],
@@ -222,7 +222,10 @@ static void view3d_main_region_setup_offscreen(Depsgraph *depsgraph,
GPU_matrix_set(rv3d->viewmat);
}
-static bool view3d_stereo3d_active(wmWindow *win, Scene *scene, View3D *v3d, RegionView3D *rv3d)
+static bool view3d_stereo3d_active(wmWindow *win,
+ const Scene *scene,
+ View3D *v3d,
+ RegionView3D *rv3d)
{
if ((scene->r.scemode & R_MULTIVIEW) == 0) {
return false;
@@ -842,7 +845,7 @@ void ED_view3d_draw_depth(Depsgraph *depsgraph, ARegion *region, View3D *v3d, bo
/* ******************** other elements ***************** */
/** could move this elsewhere, but tied into #ED_view3d_grid_scale */
-float ED_scene_grid_scale(Scene *scene, const char **grid_unit)
+float ED_scene_grid_scale(const Scene *scene, const char **grid_unit)
{
/* apply units */
if (scene->unit.system) {
@@ -863,13 +866,13 @@ float ED_scene_grid_scale(Scene *scene, const char **grid_unit)
return 1.0f;
}
-float ED_view3d_grid_scale(Scene *scene, View3D *v3d, const char **grid_unit)
+float ED_view3d_grid_scale(const Scene *scene, View3D *v3d, const char **grid_unit)
{
return v3d->grid * ED_scene_grid_scale(scene, grid_unit);
}
#define STEPS_LEN 8
-void ED_view3d_grid_steps(Scene *scene,
+void ED_view3d_grid_steps(const Scene *scene,
View3D *v3d,
RegionView3D *rv3d,
float r_grid_steps[STEPS_LEN])
@@ -1562,7 +1565,7 @@ static void view3d_draw_view(const bContext *C, ARegion *region)
DRW_draw_view(C);
}
-RenderEngineType *ED_view3d_engine_type(Scene *scene, int drawtype)
+RenderEngineType *ED_view3d_engine_type(const Scene *scene, int drawtype)
{
/*
* Temporary viewport draw modes until we have a proper system.
@@ -1606,7 +1609,7 @@ void view3d_main_region_draw(const bContext *C, ARegion *region)
* \{ */
static void view3d_stereo3d_setup_offscreen(Depsgraph *depsgraph,
- Scene *scene,
+ const Scene *scene,
View3D *v3d,
ARegion *region,
float winmat[4][4],
@@ -1630,7 +1633,7 @@ static void view3d_stereo3d_setup_offscreen(Depsgraph *depsgraph,
}
void ED_view3d_draw_offscreen(Depsgraph *depsgraph,
- Scene *scene,
+ const Scene *scene,
eDrawType drawtype,
View3D *v3d,
ARegion *region,
@@ -2309,7 +2312,7 @@ void ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d, struct RV3DMatrixSto
* \note The info that this uses is updated in #ED_refresh_viewport_fps,
* which currently gets called during #SCREEN_OT_animation_step.
*/
-void ED_scene_draw_fps(Scene *scene, int xoffset, int *yoffset)
+void ED_scene_draw_fps(const Scene *scene, int xoffset, int *yoffset)
{
ScreenFrameRateInfo *fpsi = scene->fps_info;
char printable[16];
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index 2ced545a108..610c40c37eb 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -202,7 +202,7 @@ void view3d_winmatrix_set(struct Depsgraph *depsgraph,
const View3D *v3d,
const rcti *rect);
void view3d_viewmatrix_set(struct Depsgraph *depsgraph,
- Scene *scene,
+ const struct Scene *scene,
const View3D *v3d,
RegionView3D *rv3d,
const float rect_scale[2]);
diff --git a/source/blender/editors/space_view3d/view3d_utils.c b/source/blender/editors/space_view3d/view3d_utils.c
index f6ec5c93e7f..e7153ddd361 100644
--- a/source/blender/editors/space_view3d/view3d_utils.c
+++ b/source/blender/editors/space_view3d/view3d_utils.c
@@ -586,8 +586,11 @@ bool ED_view3d_camera_lock_sync(const Depsgraph *depsgraph, View3D *v3d, RegionV
}
}
-bool ED_view3d_camera_autokey(
- Scene *scene, ID *id_key, struct bContext *C, const bool do_rotate, const bool do_translate)
+bool ED_view3d_camera_autokey(const Scene *scene,
+ ID *id_key,
+ struct bContext *C,
+ const bool do_rotate,
+ const bool do_translate)
{
if (autokeyframe_cfra_can_key(scene, id_key)) {
const float cfra = (float)CFRA;
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 9b0c987c451..ee41b73ed16 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -807,7 +807,7 @@ static void obmat_to_viewmat(RegionView3D *rv3d, Object *ob)
* \note don't set windows active in here, is used by renderwin too.
*/
void view3d_viewmatrix_set(Depsgraph *depsgraph,
- Scene *scene,
+ const Scene *scene,
const View3D *v3d,
RegionView3D *rv3d,
const float rect_scale[2])
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h
index 88614de1641..38cba264a01 100644
--- a/source/blender/render/extern/include/RE_engine.h
+++ b/source/blender/render/extern/include/RE_engine.h
@@ -198,7 +198,7 @@ void RE_engine_set_error_message(RenderEngine *engine, const char *msg);
int RE_engine_render(struct Render *re, int do_all);
-bool RE_engine_is_external(struct Render *re);
+bool RE_engine_is_external(const struct Render *re);
void RE_engine_frame_set(struct RenderEngine *engine, int frame, float subframe);
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h
index 3c089335115..fabbd5fb096 100644
--- a/source/blender/render/intern/include/render_result.h
+++ b/source/blender/render/intern/include/render_result.h
@@ -57,7 +57,7 @@ struct RenderResult *render_result_new_from_exr(
void *exrhandle, const char *colorspace, bool predivide, int rectx, int recty);
void render_result_view_new(struct RenderResult *rr, const char *viewname);
-void render_result_views_new(struct RenderResult *rr, struct RenderData *rd);
+void render_result_views_new(struct RenderResult *rr, const struct RenderData *rd);
/* Merge */
@@ -110,7 +110,7 @@ bool render_result_exr_file_cache_read(struct Render *re);
/* Combined Pixel Rect */
struct ImBuf *render_result_rect_to_ibuf(struct RenderResult *rr,
- struct RenderData *rd,
+ const struct RenderData *rd,
const int view_id);
void render_result_rect_fill_zero(struct RenderResult *rr, const int view_id);
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 598f300cf86..4fcb5f5f16e 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -116,7 +116,7 @@ RenderEngineType *RE_engines_find(const char *idname)
return type;
}
-bool RE_engine_is_external(Render *re)
+bool RE_engine_is_external(const Render *re)
{
return (re->engine && re->engine->type && re->engine->type->render);
}
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index 2021967b05d..4e20dd51122 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -798,7 +798,7 @@ void render_result_view_new(RenderResult *rr, const char *viewname)
BLI_strncpy(rv->name, viewname, sizeof(rv->name));
}
-void render_result_views_new(RenderResult *rr, RenderData *rd)
+void render_result_views_new(RenderResult *rr, const RenderData *rd)
{
SceneRenderView *srv;
@@ -1459,7 +1459,7 @@ bool render_result_exr_file_cache_read(Render *re)
/*************************** Combined Pixel Rect *****************************/
-ImBuf *render_result_rect_to_ibuf(RenderResult *rr, RenderData *rd, const int view_id)
+ImBuf *render_result_rect_to_ibuf(RenderResult *rr, const RenderData *rd, const int view_id)
{
ImBuf *ibuf = IMB_allocImBuf(rr->rectx, rr->recty, rd->im_format.planes, 0);
RenderView *rv = RE_RenderViewGetById(rr, view_id);