diff options
| -rw-r--r-- | release/scripts/ui/space_userpref.py | 6 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/jp2.c | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/radiance_hdr.c | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py index 0806eceaf47..feeae5d3f9b 100644 --- a/release/scripts/ui/space_userpref.py +++ b/release/scripts/ui/space_userpref.py @@ -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="") diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index 09b3fac08af..558eaedf8b2 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -23,6 +23,8 @@ #ifdef WITH_OPENJPEG +#include "MEM_guardedalloc.h" + #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c index a0942c281e3..c5122ebe46c 100644 --- a/source/blender/imbuf/intern/radiance_hdr.c +++ b/source/blender/imbuf/intern/radiance_hdr.c @@ -42,6 +42,9 @@ #ifdef WIN32 #include <io.h> #endif + +#include "MEM_guardedalloc.h" + #include "BLI_blenlib.h" #include "imbuf.h" |