diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2021-07-01 13:48:03 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2021-07-01 13:48:03 +0300 |
commit | d35969a74ff7a71fc0ca233ae65a2f1c47eb9a25 (patch) | |
tree | 7d12896c3a481c9d0f43f5708624b6a7cddf204e /source/blender/editors/render/render_shading.c | |
parent | efe2247e3cdb1006a5b1d87d76a96dc6a63ad12c (diff) | |
parent | 229c0580e2915b2dc349069ee7094d322408641f (diff) |
Merge branch 'master' into geometry-nodes-unnamed-attributes
Diffstat (limited to 'source/blender/editors/render/render_shading.c')
-rw-r--r-- | source/blender/editors/render/render_shading.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 36492359d5c..ae9f80f746a 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -103,7 +103,7 @@ static bool object_materials_supported_poll_ex(bContext *C, const Object *ob); /** \name Local Utilities * \{ */ -static bool object_array_for_shading_edit_mode_enabled_filter(Object *ob, void *user_data) +static bool object_array_for_shading_edit_mode_enabled_filter(const Object *ob, void *user_data) { bContext *C = user_data; if (object_materials_supported_poll_ex(C, ob)) { @@ -120,7 +120,7 @@ static Object **object_array_for_shading_edit_mode_enabled(bContext *C, uint *r_ C, object_array_for_shading_edit_mode_enabled_filter, C, r_objects_len); } -static bool object_array_for_shading_edit_mode_disabled_filter(Object *ob, void *user_data) +static bool object_array_for_shading_edit_mode_disabled_filter(const Object *ob, void *user_data) { bContext *C = user_data; if (object_materials_supported_poll_ex(C, ob)) { |