[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31441] trunk/blender: fix errors with recent commits.

[Campbell Barton]

Revision: 31441
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31441
Author:   campbellbarton
Date:     2010-08-18 12:42:00 +0200 (Wed, 18 Aug 2010)

Log Message:
-----------
fix errors with recent commits.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_userpref.py
    trunk/blender/source/blender/imbuf/intern/jp2.c
    trunk/blender/source/blender/imbuf/intern/radiance_hdr.c

Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py	2010-08-18 08:58:37 UTC (rev 31440)
+++ trunk/blender/release/scripts/ui/space_userpref.py	2010-08-18 10:42:00 UTC (rev 31441)
@@ -57,10 +57,10 @@
 def opengl_lamp_buttons(column, lamp):
     split = column.split(percentage=0.1)
 
-    split.prop(lamp, "use", text="", icon='OUTLINER_OB_LAMP' if lamp.enabled else 'LAMP_DATA')
+    split.prop(lamp, "use", text="", icon='OUTLINER_OB_LAMP' if lamp.use else 'LAMP_DATA')
 
     col = split.column()
-    col.active = lamp.enabled
+    col.active = lamp.use
     row = col.row()
     row.label(text="Diffuse:")
     row.prop(lamp, "diffuse_color", text="")
@@ -69,7 +69,7 @@
     row.prop(lamp, "specular_color", text="")
 
     col = split.column()
-    col.active = lamp.enabled
+    col.active = lamp.use
     col.prop(lamp, "direction", text="")
 
 

Modified: trunk/blender/source/blender/imbuf/intern/jp2.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jp2.c	2010-08-18 08:58:37 UTC (rev 31440)
+++ trunk/blender/source/blender/imbuf/intern/jp2.c	2010-08-18 10:42:00 UTC (rev 31441)
@@ -23,6 +23,8 @@
 
 #ifdef WITH_OPENJPEG
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 

Modified: trunk/blender/source/blender/imbuf/intern/radiance_hdr.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/radiance_hdr.c	2010-08-18 08:58:37 UTC (rev 31440)
+++ trunk/blender/source/blender/imbuf/intern/radiance_hdr.c	2010-08-18 10:42:00 UTC (rev 31441)
@@ -42,6 +42,9 @@
 #ifdef WIN32
 #include <io.h>
 #endif
+
+#include "MEM_guardedalloc.h"
+
 #include "BLI_blenlib.h"
 
 #include "imbuf.h"