[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35413] trunk/blender: - correct python3. 1 warning message.

[Campbell Barton]

Revision: 35413
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35413
Author:   campbellbarton
Date:     2011-03-08 22:11:15 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
- correct python3.1 warning message.
- for new shadow only enum, use humanly readable RNA enum values.
- update cmake unix example for custom python.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/blender/makesrna/intern/rna_material.c
    trunk/blender/source/blender/python/intern/bpy_util.h

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-03-08 20:41:43 UTC (rev 35412)
+++ trunk/blender/CMakeLists.txt	2011-03-08 22:11:15 UTC (rev 35413)
@@ -200,9 +200,17 @@
 
 # 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
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_material.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_material.c	2011-03-08 20:41:43 UTC (rev 35412)
+++ trunk/blender/source/blender/makesrna/intern/rna_material.c	2011-03-08 22:11:15 UTC (rev 35413)
@@ -1584,9 +1584,9 @@
 		{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");

Modified: trunk/blender/source/blender/python/intern/bpy_util.h
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_util.h	2011-03-08 20:41:43 UTC (rev 35412)
+++ trunk/blender/source/blender/python/intern/bpy_util.h	2011-03-08 22:11:15 UTC (rev 35413)
@@ -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 */