[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31445] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 31442.

[Tamito Kajiyama]

Revision: 31445
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31445
Author:   kjym3
Date:     2010-08-18 16:10:28 +0200 (Wed, 18 Aug 2010)

Log Message:
-----------
Merged changes in the trunk up to revision 31442.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31442

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/release/scripts/ui/space_time.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/radiance_hdr.c

Modified: branches/soc-2008-mxcurioni/release/scripts/ui/space_time.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/space_time.py	2010-08-18 14:03:11 UTC (rev 31444)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/space_time.py	2010-08-18 14:10:28 UTC (rev 31445)
@@ -56,7 +56,7 @@
         row = layout.row(align=True)
         row.operator("screen.frame_jump", text="", icon='REW').end = False
         row.operator("screen.keyframe_jump", text="", icon='PREV_KEYFRAME').next = False
-        if not screen.animation_playing:
+        if not screen.is_animation_playing:
             row.operator("screen.animation_play", text="", icon='PLAY_REVERSE').reverse = True
             row.operator("screen.animation_play", text="", icon='PLAY')
         else:
@@ -68,7 +68,7 @@
 
         row = layout.row(align=True)
         row.prop(tools, "use_keyframe_insert_auto", text="", toggle=True)
-        if screen.animation_playing and tools.use_keyframe_insert_auto:
+        if screen.is_animation_playing and tools.use_keyframe_insert_auto:
             subsub = row.row()
             subsub.prop(tools, "use_record_with_nla", toggle=True)
 

Modified: branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py	2010-08-18 14:03:11 UTC (rev 31444)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py	2010-08-18 14:10:28 UTC (rev 31445)
@@ -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: branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c	2010-08-18 14:03:11 UTC (rev 31444)
+++ branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c	2010-08-18 14:10:28 UTC (rev 31445)
@@ -23,6 +23,8 @@
 
 #ifdef WITH_OPENJPEG
 
+#include "MEM_guardedalloc.h"
+
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 

Modified: branches/soc-2008-mxcurioni/source/blender/imbuf/intern/radiance_hdr.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/imbuf/intern/radiance_hdr.c	2010-08-18 14:03:11 UTC (rev 31444)
+++ branches/soc-2008-mxcurioni/source/blender/imbuf/intern/radiance_hdr.c	2010-08-18 14:10:28 UTC (rev 31445)
@@ -42,6 +42,9 @@
 #ifdef WIN32
 #include <io.h>
 #endif
+
+#include "MEM_guardedalloc.h"
+
 #include "BLI_blenlib.h"
 
 #include "imbuf.h"