Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-08-18 06:35:39 +0400
committerThomas Dinges <blender@dingto.org>2013-08-18 06:35:39 +0400
commit7cce5563445a5363f9d125bf8c3cb30734cabdfe (patch)
tree2b83febea3444afebcd5561657997a0b25852680 /source
parentee2d95f8507a46a8ac025582c1b6188ff9468046 (diff)
Code cleanup:
* Forgot to remove RNA/DNA in r59043. No need to keep this here, we never used it in Trunk.
Diffstat (limited to 'source')
-rw-r--r--source/blender/makesdna/DNA_node_types.h4
-rw-r--r--source/blender/makesrna/intern/rna_nodetree.c10
2 files changed, 0 insertions, 14 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 109cdf5f1a1..fda696f2e28 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -937,10 +937,6 @@ typedef struct NodeShaderNormalMap {
#define SHD_WAVE_BANDS 0
#define SHD_WAVE_RINGS 1
-#define SHD_WAVE_SINE 0
-#define SHD_WAVE_SAW 1
-#define SHD_WAVE_TRI 2
-
/* image/environment texture */
#define SHD_COLORSPACE_NONE 0
#define SHD_COLORSPACE_COLOR 1
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 3b594ab0961..b4576509098 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -159,7 +159,6 @@ EnumPropertyItem node_sampler_type_items[] = {
{0, NULL, 0, NULL, NULL}
};
-
EnumPropertyItem prop_noise_basis_items[] = {
{SHD_NOISE_PERLIN, "PERLIN", 0, "Perlin", ""},
{SHD_NOISE_VORONOI_F1, "VORONOI_F1", 0, "Voronoi F1", ""},
@@ -178,15 +177,6 @@ EnumPropertyItem prop_noise_type_items[] = {
{0, NULL, 0, NULL, NULL}
};
-#if 0
-EnumPropertyItem prop_wave_items[] = {
- {SHD_WAVE_SINE, "SINE", 0, "Sine", "Use a sine wave to produce bands"},
- {SHD_WAVE_SAW, "SAW", 0, "Saw", "Use a saw wave to produce bands"},
- {SHD_WAVE_TRI, "TRI", 0, "Tri", "Use a triangle wave to produce bands"},
- {0, NULL, 0, NULL, NULL}
-};
-#endif
-
#ifdef RNA_RUNTIME
#include "BLI_linklist.h"