Merge branch 'master' into cycles_path_guidingcycles_path_guiding

1 files changed, 8 insertions, 4 deletions

diff --git a/source/blender/blenkernel/BKE_duplilist.h b/source/blender/blenkernel/BKE_duplilist.h
index 44c4df1fc2e..a0732bf39cf 100644
--- a/source/blender/blenkernel/BKE_duplilist.h
+++ b/source/blender/blenkernel/BKE_duplilist.h
@@ -76,16 +76,20 @@ typedef struct DupliObject {
   unsigned int random_id;
 } DupliObject;
 
-/** Look up the RGBA value of a uniform shader attribute.
- *  \return true if the attribute was found; if not, r_value is also set to zero. */
+/**
+ * Look up the RGBA value of a uniform shader attribute.
+ * \return true if the attribute was found; if not, r_value is also set to zero.
+ */
 bool BKE_object_dupli_find_rgba_attribute(struct Object *ob,
                                           struct DupliObject *dupli,
                                           struct Object *dupli_parent,
                                           const char *name,
                                           float r_value[4]);
 
-/** Look up the RGBA value of a view layer/scene/world shader attribute.
- *  \return true if the attribute was found; if not, r_value is also set to zero. */
+/**
+ * Look up the RGBA value of a view layer/scene/world shader attribute.
+ * \return true if the attribute was found; if not, r_value is also set to zero.
+ */
 bool BKE_view_layer_find_rgba_attribute(struct Scene *scene,
                                         struct ViewLayer *layer,
                                         const char *name,