diff options
| author | YimingWu <xp8110@outlook.com> | 2020-06-04 13:57:28 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-06-04 13:57:28 +0300 |
| commit | bfbf0bb7f7a0191b65fc724d5dfea225e6293c6b (patch) | |
| tree | 042f37d28c9e1cf0ce5a0fb4fd4235288f62d36e /source/blender/editors/space_buttons/buttons_texture.c | |
| parent | 3b52dfe549f0c2fca7e0cd499b85fb098e9b4da9 (diff) | |
| parent | 78017916f7c7a8ec8907c9b993214ff8ec3c3557 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-reviewtemp-lanpr-review
# Conflicts:
# release/datafiles/locale
# release/scripts/addons
Diffstat (limited to 'source/blender/editors/space_buttons/buttons_texture.c')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_texture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index 5bf431be9f8..3dc5eca8a8b 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -545,7 +545,7 @@ static void template_texture_show(bContext *C, void *data_p, void *prop_p) } } -void uiTemplateTextureShow(uiLayout *layout, bContext *C, PointerRNA *ptr, PropertyRNA *prop) +void uiTemplateTextureShow(uiLayout *layout, const bContext *C, PointerRNA *ptr, PropertyRNA *prop) { /* button to quickly show texture in texture tab */ SpaceProperties *sbuts = CTX_wm_space_properties(C); |