fix errors with recent commits.
authorCampbell Barton <ideasman42@gmail.com>
Wed, 18 Aug 2010 10:42:00 +0000 (10:42 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 18 Aug 2010 10:42:00 +0000 (10:42 +0000)
release/scripts/ui/space_userpref.py
source/blender/imbuf/intern/jp2.c
source/blender/imbuf/intern/radiance_hdr.c

index 0806eceaf47fa58c8e64051ffa12959669c9b083..feeae5d3f9b51ce18e83e82fd45e0a07cb20c22e 100644 (file)
@@ -57,10 +57,10 @@ def ui_items_general(col, context):
 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 @@ def opengl_lamp_buttons(column, lamp):
     row.prop(lamp, "specular_color", text="")
 
     col = split.column()
-    col.active = lamp.enabled
+    col.active = lamp.use
     col.prop(lamp, "direction", text="")
 
 
index 09b3fac08afc23f622ec620db53cb5ee4f8f300c..558eaedf8b2bd8db88767c5fc2b5c85107d58cae 100644 (file)
@@ -23,6 +23,8 @@
 
 #ifdef WITH_OPENJPEG
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 
index a0942c281e3c7cb4384cb5342e4c8beadfe02c98..c5122ebe46c2d3d20104a1a47212dfbce63ea87f 100644 (file)
@@ -42,6 +42,9 @@
 #ifdef WIN32
 #include <io.h>
 #endif
+
+#include "MEM_guardedalloc.h"
+
 #include "BLI_blenlib.h"
 
 #include "imbuf.h"