Cleanup: use 'r_' prefix for output arguments

Also pass some args as 'const'.

4 files changed, 40 insertions, 40 deletions

diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 06158e6f1f4..0766996c00b 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1368,68 +1368,68 @@ static void seq_prefetch_wm_notify(const bContext *C, Scene *scene)
 }
 
 static void *sequencer_OCIO_transform_ibuf(
-    const bContext *C, ImBuf *ibuf, bool *glsl_used, int *format, int *type)
+    const bContext *C, ImBuf *ibuf, bool *r_glsl_used, int *r_format, int *r_type)
 {
   void *display_buffer;
   void *cache_handle = NULL;
   bool force_fallback = false;
-  *glsl_used = false;
+  *r_glsl_used = false;
   force_fallback |= (ED_draw_imbuf_method(ibuf) != IMAGE_DRAW_METHOD_GLSL);
   force_fallback |= (ibuf->dither != 0.0f);
 
   if (force_fallback) {
     /* Fallback to CPU based color space conversion */
-    *glsl_used = false;
-    *format = GL_RGBA;
-    *type = GL_UNSIGNED_BYTE;
+    *r_glsl_used = false;
+    *r_format = GL_RGBA;
+    *r_type = GL_UNSIGNED_BYTE;
     display_buffer = NULL;
   }
   else if (ibuf->rect_float) {
     display_buffer = ibuf->rect_float;
 
     if (ibuf->channels == 4) {
-      *format = GL_RGBA;
+      *r_format = GL_RGBA;
     }
     else if (ibuf->channels == 3) {
-      *format = GL_RGB;
+      *r_format = GL_RGB;
     }
     else {
       BLI_assert(!"Incompatible number of channels for float buffer in sequencer");
-      *format = GL_RGBA;
+      *r_format = GL_RGBA;
       display_buffer = NULL;
     }
 
-    *type = GL_FLOAT;
+    *r_type = GL_FLOAT;
 
     if (ibuf->float_colorspace) {
-      *glsl_used = IMB_colormanagement_setup_glsl_draw_from_space_ctx(
+      *r_glsl_used = IMB_colormanagement_setup_glsl_draw_from_space_ctx(
           C, ibuf->float_colorspace, ibuf->dither, true);
     }
     else {
-      *glsl_used = IMB_colormanagement_setup_glsl_draw_ctx(C, ibuf->dither, true);
+      *r_glsl_used = IMB_colormanagement_setup_glsl_draw_ctx(C, ibuf->dither, true);
     }
   }
   else if (ibuf->rect) {
     display_buffer = ibuf->rect;
-    *format = GL_RGBA;
-    *type = GL_UNSIGNED_BYTE;
+    *r_format = GL_RGBA;
+    *r_type = GL_UNSIGNED_BYTE;
 
-    *glsl_used = IMB_colormanagement_setup_glsl_draw_from_space_ctx(
+    *r_glsl_used = IMB_colormanagement_setup_glsl_draw_from_space_ctx(
         C, ibuf->rect_colorspace, ibuf->dither, false);
   }
   else {
-    *format = GL_RGBA;
-    *type = GL_UNSIGNED_BYTE;
+    *r_format = GL_RGBA;
+    *r_type = GL_UNSIGNED_BYTE;
     display_buffer = NULL;
   }
 
   /* there's a data to be displayed, but GLSL is not initialized
    * properly, in this case we fallback to CPU-based display transform
    */
-  if ((ibuf->rect || ibuf->rect_float) && !*glsl_used) {
+  if ((ibuf->rect || ibuf->rect_float) && !*r_glsl_used) {
     display_buffer = IMB_display_buffer_acquire_ctx(C, ibuf, &cache_handle);
-    *format = GL_RGBA;
-    *type = GL_UNSIGNED_BYTE;
+    *r_format = GL_RGBA;
+    *r_type = GL_UNSIGNED_BYTE;
   }
   if (cache_handle) {
     IMB_display_buffer_release(cache_handle);
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 3f36c844f30..71e63547eae 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -551,15 +551,15 @@ bool ED_space_sequencer_check_show_strip(SpaceSeq *sseq)
 int seq_effect_find_selected(Scene *scene,
                              Sequence *activeseq,
                              int type,
-                             Sequence **selseq1,
-                             Sequence **selseq2,
-                             Sequence **selseq3,
-                             const char **error_str)
+                             Sequence **r_selseq1,
+                             Sequence **r_selseq2,
+                             Sequence **r_selseq3,
+                             const char **r_error_str)
 {
   Editing *ed = BKE_sequencer_editing_get(scene, false);
   Sequence *seq1 = NULL, *seq2 = NULL, *seq3 = NULL, *seq;
 
-  *error_str = NULL;
+  *r_error_str = NULL;
 
   if (!activeseq) {
     seq2 = BKE_sequencer_active_get(scene);
@@ -568,7 +568,7 @@ int seq_effect_find_selected(Scene *scene,
   for (seq = ed->seqbasep->first; seq; seq = seq->next) {
     if (seq->flag & SELECT) {
       if (seq->type == SEQ_TYPE_SOUND_RAM && BKE_sequence_effect_get_num_inputs(type) != 0) {
-        *error_str = N_("Cannot apply effects to audio sequence strips");
+        *r_error_str = N_("Cannot apply effects to audio sequence strips");
         return 0;
       }
       if ((seq != activeseq) && (seq != seq2)) {
@@ -582,7 +582,7 @@ int seq_effect_find_selected(Scene *scene,
           seq3 = seq;
         }
         else {
-          *error_str = N_("Cannot apply effect to more than 3 sequence strips");
+          *r_error_str = N_("Cannot apply effect to more than 3 sequence strips");
           return 0;
         }
       }
@@ -599,11 +599,11 @@ int seq_effect_find_selected(Scene *scene,
 
   switch (BKE_sequence_effect_get_num_inputs(type)) {
     case 0:
-      *selseq1 = *selseq2 = *selseq3 = NULL;
+      *r_selseq1 = *r_selseq2 = *r_selseq3 = NULL;
       return 1; /* success */
     case 1:
       if (seq2 == NULL) {
-        *error_str = N_("At least one selected sequence strip is needed");
+        *r_error_str = N_("At least one selected sequence strip is needed");
         return 0;
       }
       if (seq1 == NULL) {
@@ -615,7 +615,7 @@ int seq_effect_find_selected(Scene *scene,
       ATTR_FALLTHROUGH;
     case 2:
       if (seq1 == NULL || seq2 == NULL) {
-        *error_str = N_("2 selected sequence strips are needed");
+        *r_error_str = N_("2 selected sequence strips are needed");
         return 0;
       }
       if (seq3 == NULL) {
@@ -625,13 +625,13 @@ int seq_effect_find_selected(Scene *scene,
   }
 
   if (seq1 == NULL && seq2 == NULL && seq3 == NULL) {
-    *error_str = N_("TODO: in what cases does this happen?");
+    *r_error_str = N_("TODO: in what cases does this happen?");
     return 0;
   }
 
-  *selseq1 = seq1;
-  *selseq2 = seq2;
-  *selseq3 = seq3;
+  *r_selseq1 = seq1;
+  *r_selseq2 = seq2;
+  *r_selseq3 = seq3;
 
   return 1;
 }
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h
index fe3170e10e0..f70bc06caf7 100644
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@ -83,10 +83,10 @@ void recurs_sel_seq(struct Sequence *seqm);
 int seq_effect_find_selected(struct Scene *scene,
                              struct Sequence *activeseq,
                              int type,
-                             struct Sequence **selseq1,
-                             struct Sequence **selseq2,
-                             struct Sequence **selseq3,
-                             const char **error_str);
+                             struct Sequence **r_selseq1,
+                             struct Sequence **r_selseq2,
+                             struct Sequence **r_selseq3,
+                             const char **r_error_str);
 
 /* operator helpers */
 bool sequencer_edit_poll(struct bContext *C);
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c
index 21833bfda71..447bf27099d 100644
--- a/source/blender/editors/space_sequencer/space_sequencer.c
+++ b/source/blender/editors/space_sequencer/space_sequencer.c
@@ -363,7 +363,7 @@ static void sequencer_listener(wmWindow *UNUSED(win),
 static bool image_drop_poll(bContext *C,
                             wmDrag *drag,
                             const wmEvent *event,
-                            const char **UNUSED(tooltip))
+                            const char **UNUSED(r_tooltip))
 {
   ARegion *region = CTX_wm_region(C);
   Scene *scene = CTX_data_scene(C);
@@ -383,7 +383,7 @@ static bool image_drop_poll(bContext *C,
 static bool movie_drop_poll(bContext *C,
                             wmDrag *drag,
                             const wmEvent *event,
-                            const char **UNUSED(tooltip))
+                            const char **UNUSED(r_tooltip))
 {
   ARegion *region = CTX_wm_region(C);
   Scene *scene = CTX_data_scene(C);
@@ -402,7 +402,7 @@ static bool movie_drop_poll(bContext *C,
 static bool sound_drop_poll(bContext *C,
                             wmDrag *drag,
                             const wmEvent *event,
-                            const char **UNUSED(tooltip))
+                            const char **UNUSED(r_tooltip))
 {
   ARegion *region = CTX_wm_region(C);
   Scene *scene = CTX_data_scene(C);