[Bf-blender-cvs] [1f0b21e713b] master: Cleanup: pass const args (mostly Scene & RenderData)
Campbell Barton
noreply at git.blender.org
Fri Mar 13 07:31:09 CET 2020
Commit: 1f0b21e713b00ed56e5a7606b9fd8c719ff3b3bb
Author: Campbell Barton
Date: Fri Mar 13 17:27:11 2020 +1100
Branches: master
https://developer.blender.org/rB1f0b21e713b00ed56e5a7606b9fd8c719ff3b3bb
Cleanup: pass const args (mostly Scene & RenderData)
===================================================================
M source/blender/blenkernel/BKE_camera.h
M source/blender/blenkernel/BKE_image.h
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/BKE_sequencer.h
M source/blender/blenkernel/BKE_sound.h
M source/blender/blenkernel/BKE_writeavi.h
M source/blender/blenkernel/BKE_writeffmpeg.h
M source/blender/blenkernel/intern/camera.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/sound.c
M source/blender/blenkernel/intern/writeavi.c
M source/blender/blenkernel/intern/writeffmpeg.c
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/draw/engines/external/external_engine.c
M source/blender/draw/intern/draw_manager.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/animation/keyingsets.c
M source/blender/editors/include/ED_keyframing.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/include/ED_view3d_offscreen.h
M source/blender/editors/space_node/node_edit.c
M source/blender/editors/space_view3d/view3d_camera_control.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/editors/space_view3d/view3d_utils.c
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/render/extern/include/RE_engine.h
M source/blender/render/intern/include/render_result.h
M source/blender/render/intern/source/external_engine.c
M source/blender/render/intern/source/render_result.c
===================================================================
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/blend
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list