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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-01-07 19:55:56 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-01-07 19:55:56 +0300
commitb9fe5399e83c71ffce44f766b4c8bce92e40bc46 (patch)
tree21ce3dfe1008a440dc13bec4921796304e52f363 /source/blender/makesrna
parentf01cac08e782aa1037dfd2b11eb6df7c3ab8418c (diff)
Revert bump mapping patch for now, backwards compatibility is not good enough,
we may need to preserve the previous method.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_material.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index f8de8bd9664..0fdb42f9146 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -368,9 +368,8 @@ static void rna_def_material_mtex(BlenderRNA *brna)
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem prop_bump_method_items[] = {
- {0, "BUMP_OLD", 0, "Old Bump", ""},
- {MTEX_NEW_BUMP, "BUMP_3_TAP", 0, "3-Tap", ""},
- {MTEX_NEW_BUMP|MTEX_5TAP_BUMP, "BUMP_5_TAP", 0, "5-Tap", ""},
+ {0, "BUMP_ORIGINAL", 0, "Original", ""},
+ {MTEX_NEW_BUMP, "BUMP_IMPROVED", 0, "Improved", ""},
{0, NULL, 0, NULL, NULL}};
srna= RNA_def_struct(brna, "MaterialTextureSlot", "TextureSlot");