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:
authorCampbell Barton <ideasman42@gmail.com>2011-03-09 01:11:15 +0300
committerCampbell Barton <ideasman42@gmail.com>2011-03-09 01:11:15 +0300
commit65273cf82ff165e056042dada073ee9b905bed4a (patch)
treeeebb405da6e81e3778d3eb22265ccd3fa17d3668 /source/blender
parent94b5fd6eb94e69e25d8f6c193096014abeb93e0e (diff)
- correct python3.1 warning message.
- for new shadow only enum, use humanly readable RNA enum values. - update cmake unix example for custom python.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/makesrna/intern/rna_material.c6
-rw-r--r--source/blender/python/intern/bpy_util.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 179b0770322..66939b58550 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -1584,9 +1584,9 @@ void RNA_def_material(BlenderRNA *brna)
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem prop_shadows_only_items[] = {
- {MA_SO_OLD, "SO_OLD", 0, "Shadow and Distance", ""},
- {MA_SO_SHADOW, "SO_SHADOW", 0, "Shadow Only", ""},
- {MA_SO_SHADED, "SO_SHADED", 0, "Shadow and Shading", ""},
+ {MA_SO_OLD, "SHADOW_ONLY_OLD", 0, "Shadow and Distance", ""},
+ {MA_SO_SHADOW, "SHADOW_ONLY", 0, "Shadow Only", ""},
+ {MA_SO_SHADED, "SHADOW_ONLY_SHADED", 0, "Shadow and Shading", ""},
{0, NULL, 0, NULL, NULL}};
srna= RNA_def_struct(brna, "Material", "ID");
diff --git a/source/blender/python/intern/bpy_util.h b/source/blender/python/intern/bpy_util.h
index 606eefc8960..7d1947a5a52 100644
--- a/source/blender/python/intern/bpy_util.h
+++ b/source/blender/python/intern/bpy_util.h
@@ -31,7 +31,7 @@
#define BPY_UTIL_H
#if PY_VERSION_HEX < 0x03020000
-#error "Python versions below 3.1 are not supported anymore, you'll need to update your python."
+#error "Python 3.2 or greater is required, you'll need to update your python."
#endif
#include "RNA_types.h" /* for EnumPropertyItem only */