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 <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/blender/blenkernel/intern
parentfa823f0af8675be076c1a43c09b56dfa0f27010d (diff)
Cleanup: pass const args (mostly Scene & RenderData)
Diffstat (limited to 'source/blender/blenkernel/intern')
-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
7 files changed, 43 insertions, 39 deletions
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;