diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 04:02:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 04:26:49 +0300 |
| commit | 1079742db92576d79ec89a28d95336aff847a82a (patch) | |
| tree | 2e440e498c20d3205c2a64eedf4f84bf57abcb84 /source/blender/makesdna | |
| parent | 918941483f7ec5fc6320d345c755e953b963c710 (diff) | |
Cleanup: rename lamp -> light
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_lamp_types.h | 6 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h index c220b377a0e..2478ee24edf 100644 --- a/source/blender/makesdna/DNA_lamp_types.h +++ b/source/blender/makesdna/DNA_lamp_types.h @@ -90,7 +90,7 @@ typedef struct Light { struct bNodeTree *nodetree; } Light; -/* **************** LAMP ********************* */ +/* **************** LIGHT ********************* */ /* flag */ #define LA_DS_EXPAND (1 << 0) @@ -121,8 +121,8 @@ typedef struct Light { /* #define LA_NO_DIFF (1 << 11) */ /* not used anywhere */ /* #define LA_NO_SPEC (1 << 12) */ /* not used anywhere */ /* #define LA_SHAD_RAY (1 << 13) */ /* not used anywhere - cleaned */ -/* yafray: lamp shadowbuffer flag, softlight */ -/* Since it is used with LOCAL lamp, can't use LA_SHAD */ +/* yafray: light shadowbuffer flag, softlight */ +/* Since it is used with LOCAL light, can't use LA_SHAD */ /* #define LA_YF_SOFT (1 << 14) */ /* not used anymore */ /* #define LA_LAYER_SHADOW (1 << 15) */ /* not used anymore */ /* #define LA_SHAD_TEX (1 << 16) */ /* not used anymore */ diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 2349028685d..117ad1cab0d 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -150,7 +150,7 @@ typedef struct Material { /* Ror buttons and render. */ char pr_type, use_nodes; - short pr_lamp, pr_texture; + short pr_light, pr_texture; /* Index for render passes. */ short index; @@ -195,7 +195,7 @@ typedef struct Material { /* **************** MATERIAL ********************* */ /* maximum number of materials per material array. - * (on object, mesh, lamp, etc.). limited by + * (on object, mesh, light, etc.). limited by * short mat_nr in verts, faces. * -1 because for active material we store the index + 1 */ #define MAXMAT (32767-1) diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index 5fbcf107823..b34d79a9600 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -78,7 +78,7 @@ typedef struct MTex { float lifefac, sizefac, ivelfac, fieldfac; float twistfac; - /* lamp */ + /* light */ float shadowfac; /* world */ @@ -405,7 +405,7 @@ typedef struct ColorMapping { #define TEX_RGB 1 #define TEX_NOR 2 -/* pr_texture in material, world, lamp, */ +/* pr_texture in material, world, light. */ #define TEX_PR_TEXTURE 0 #define TEX_PR_OTHER 1 #define TEX_PR_BOTH 2 |