[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21090] branches/soc-2009-yukishiro: remove two warnings and revert changes to config file

[Jingyuan Huang]

Revision: 21090
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21090
Author:   yukishiro
Date:     2009-06-23 01:13:09 +0200 (Tue, 23 Jun 2009)

Log Message:
-----------
remove two warnings and revert changes to config file

Modified Paths:
--------------
    branches/soc-2009-yukishiro/config/linux2-config.py
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lightenv.c

Modified: branches/soc-2009-yukishiro/config/linux2-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/linux2-config.py	2009-06-22 23:05:16 UTC (rev 21089)
+++ branches/soc-2009-yukishiro/config/linux2-config.py	2009-06-22 23:13:09 UTC (rev 21090)
@@ -74,8 +74,8 @@
 BF_GETTEXT_LIB = 'gettextlib'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_GAMEENGINE = False 
-WITH_BF_PLAYER = False
+WITH_BF_GAMEENGINE = True
+WITH_BF_PLAYER = True
 
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'

Modified: branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c	2009-06-22 23:05:16 UTC (rev 21089)
+++ branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c	2009-06-22 23:13:09 UTC (rev 21090)
@@ -81,6 +81,7 @@
 #include "BKE_image.h"
 #include "BKE_key.h"
 #include "BKE_lattice.h"
+#include "BKE_lightenv.h"
 #include "BKE_mesh.h"
 #include "BKE_material.h"
 #include "BKE_mball.h"

Modified: branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lightenv.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lightenv.c	2009-06-22 23:05:16 UTC (rev 21089)
+++ branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lightenv.c	2009-06-22 23:13:09 UTC (rev 21090)
@@ -69,7 +69,7 @@
 	RNA_def_property_enum_sdna(prop, NULL, "type");
 	RNA_def_property_enum_items(prop, prop_type_items);
 	RNA_def_property_ui_text(prop, "Type", "LightEnv types.");
-	RNA_def_property_update(prop, NULL, "rna_LightEnv_type_set");
+	RNA_def_property_update(prop, 0, "rna_LightEnv_type_set");
 
 	prop= RNA_def_property(srna, "probe_image", PROP_POINTER, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Probe Image", "Probe image used for calculating the light env.");