[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47682] trunk/blender/source/blender/ blenkernel/intern/image.c: Fix #31778. BKE_image_user_frame_calc can be called with iuser== NULL in some circumstances now, so needs to check that.

[Lukas Toenne]

Revision: 47682
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47682
Author:   lukastoenne
Date:     2012-06-10 15:07:08 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
Fix #31778. BKE_image_user_frame_calc can be called with iuser==NULL in some 
circumstances now, so needs to check that.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c      2012-06-10 
13:39:22 UTC (rev 47681)
+++ trunk/blender/source/blender/blenkernel/intern/image.c      2012-06-10 
15:07:08 UTC (rev 47682)
@@ -2722,15 +2722,17 @@
 
 void BKE_image_user_frame_calc(ImageUser *iuser, int cfra, int fieldnr)
 {
-       const int framenr = BKE_image_user_frame_get(iuser, cfra, fieldnr);
-
-       /* allows image users to handle redraws */
-       if (iuser->flag & IMA_ANIM_ALWAYS)
-               if (framenr != iuser->framenr)
-                       iuser->flag |= IMA_ANIM_REFRESHED;
-
-       iuser->framenr = framenr;
-       if (iuser->ok == 0) iuser->ok = 1;
+       if (iuser) {
+               const int framenr = BKE_image_user_frame_get(iuser, cfra, 
fieldnr);
+               
+               /* allows image users to handle redraws */
+               if (iuser->flag & IMA_ANIM_ALWAYS)
+                       if (framenr != iuser->framenr)
+                               iuser->flag |= IMA_ANIM_REFRESHED;
+               
+               iuser->framenr = framenr;
+               if (iuser->ok == 0) iuser->ok = 1;
+       }
 }
 
 void BKE_image_user_check_frame_calc(ImageUser *iuser, int cfra, int fieldnr)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs