diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2021-02-20 17:37:07 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2021-02-20 17:37:07 +0300 |
| commit | 7bf2108e4bb360f1ba7f9d50b8726c9b28b93026 (patch) | |
| tree | 1236e3de93290784f390f787cd6ef4a9bc904712 /source/blender/makesdna/DNA_material_types.h | |
| parent | 43c43b8d48017ad9e34d43478403067be6fe8365 (diff) | |
| parent | 5dced2a0636a7f3db73be09139cf8abd952612e7 (diff) | |
Merge branch 'master' into temp-lineart-contained
Diffstat (limited to 'source/blender/makesdna/DNA_material_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 38c50b61dbc..55d5ea202f7 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -45,11 +45,11 @@ struct bNodeTree; typedef struct TexPaintSlot { /** Image to be painted on. */ struct Image *ima; - /** Customdata index for uv layer, MAX_NAM.E*/ + /** Custom-data index for uv layer, #MAX_NAME. */ char *uvname; /** Do we have a valid image and UV map. */ int valid; - /** Copy of node inteporlation setting. */ + /** Copy of node interpolation setting. */ int interp; } TexPaintSlot; |