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-25 09:58:58 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-03-25 09:58:58 +0300
commit2bc791437e3b8e42c1369daf15c72934474b1e73 (patch)
treef2202c3753c8288bea47d3c0edd10bcf01cdf339 /source/blender/imbuf/intern
parentc3764fe1e80670cd578df7bbc5c37c267e81013a (diff)
Cleanup: use 'r_' prefix for output arguments
Also pass some args as 'const'.
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r--source/blender/imbuf/intern/colormanagement.c10
-rw-r--r--source/blender/imbuf/intern/moviecache.c14
2 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index a95db5c1de4..c57ab70f4e6 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -789,18 +789,18 @@ void colormanage_cache_free(ImBuf *ibuf)
void IMB_colormanagement_display_settings_from_ctx(
const bContext *C,
- ColorManagedViewSettings **view_settings_r,
- ColorManagedDisplaySettings **display_settings_r)
+ ColorManagedViewSettings **r_view_settings,
+ ColorManagedDisplaySettings **r_display_settings)
{
Scene *scene = CTX_data_scene(C);
SpaceImage *sima = CTX_wm_space_image(C);
- *view_settings_r = &scene->view_settings;
- *display_settings_r = &scene->display_settings;
+ *r_view_settings = &scene->view_settings;
+ *r_display_settings = &scene->display_settings;
if (sima && sima->image) {
if ((sima->image->flag & IMA_VIEW_AS_RENDER) == 0) {
- *view_settings_r = NULL;
+ *r_view_settings = NULL;
}
}
}
diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c
index f3b76288831..96ecbdce9cc 100644
--- a/source/blender/imbuf/intern/moviecache.c
+++ b/source/blender/imbuf/intern/moviecache.c
@@ -479,10 +479,10 @@ void IMB_moviecache_cleanup(MovieCache *cache,
/* get segments of cached frames. useful for debugging cache policies */
void IMB_moviecache_get_cache_segments(
- MovieCache *cache, int proxy, int render_flags, int *totseg_r, int **points_r)
+ MovieCache *cache, int proxy, int render_flags, int *r_totseg, int **r_points)
{
- *totseg_r = 0;
- *points_r = NULL;
+ *r_totseg = 0;
+ *r_points = NULL;
if (!cache->getdatafp) {
return;
@@ -497,8 +497,8 @@ void IMB_moviecache_get_cache_segments(
}
if (cache->points) {
- *totseg_r = cache->totseg;
- *points_r = cache->points;
+ *r_totseg = cache->totseg;
+ *r_points = cache->points;
}
else {
int totframe = BLI_ghash_len(cache->hash);
@@ -555,8 +555,8 @@ void IMB_moviecache_get_cache_segments(
}
}
- *totseg_r = totseg;
- *points_r = points;
+ *r_totseg = totseg;
+ *r_points = points;
cache->totseg = totseg;
cache->points = points;