- correct python3.1 warning message.
authorCampbell Barton <ideasman42@gmail.com>
Tue, 8 Mar 2011 22:11:15 +0000 (22:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 8 Mar 2011 22:11:15 +0000 (22:11 +0000)
- for new shadow only enum, use humanly readable RNA enum values.
- update cmake unix example for custom python.

CMakeLists.txt
source/blender/makesrna/intern/rna_material.c
source/blender/python/intern/bpy_util.h

index fbe55969978bc9c4d918fb9ff9576fa9993a409d..4a7985cf72129820621612003d8684ee53219769 100644 (file)
@@ -200,9 +200,17 @@ set(CXX_WARNINGS "")
 
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
 # On Unix: 
-#   cmake -D PYTHON_LIBRARY=/usr/local/lib/python3.2/config/libpython3.2.so -D PYTHON_INCLUDE_DIRS=/usr/local/include/python3.2 ../blender
+#   cmake ../blender \
+#         -D PYTHON_VERSION=3.2 \
+#         -D PYTHON_INCLUDE_DIRS=/opt/py32/include/python3.2d \
+#         -D PYTHON_LIBPATH=/opt/py32/lib \
+#         -D PYTHON_LIBRARY=python3.2d
+#
 # On Macs: 
-#   cmake -D PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2/config -G Xcode ../blender
+#   cmake ../blender \
+#         -D PYTHON_INCLUDE_DIRS=/System/Library/Frameworks/Python.framework/Versions/3.2/include/python3.2 \
+#         -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.2/lib/python3.2/config \
+#         -G Xcode
 #
 # When changing any of this remember to update the notes in doc/build_systems/cmake.txt
 
index 179b077032216f7c24c8a84365aabe21ccc77544..66939b58550442b70030f70d2913aed17cdc8d48 100644 (file)
@@ -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");
index 606eefc89609bd337fabc6031361444e2df9618c..7d1947a5a525f1750ca54da441f29efb7dc5397f 100644 (file)
@@ -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 */