diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-11-12 01:18:46 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-11-12 01:18:46 +0300 |
| commit | c29795452cc71cb9f5a571a4aff0f593a2d7acaf (patch) | |
| tree | 53a46bb77f3102c545f7e55d3344e310b3bf6116 /source/blender/editors/uvedit/uvedit_ops.c | |
| parent | 9980fd0b8e1f3a07060316f28469f55a3f2fc0cd (diff) | |
| parent | 03ccf37162d365f3fdc8d8cd0cd6e9ff314fec6e (diff) | |
Merge branch 'master' into temp-sculpt-roll-mappingtemp-sculpt-roll-mapping
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_ops.c')
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index b65f4889347..0e77a8ba4ad 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -111,8 +111,8 @@ bool ED_object_get_active_image(Object *ob, int mat_nr, Image **r_ima, ImageUser **r_iuser, - bNode **r_node, - bNodeTree **r_ntree) + const bNode **r_node, + const bNodeTree **r_ntree) { Material *ma = DEG_is_evaluated_object(ob) ? BKE_object_material_get_eval(ob, mat_nr) : BKE_object_material_get(ob, mat_nr); |