[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60951] trunk/blender/source/blender/ render/intern/source/convertblender.c: fix [#37195] particles crash with viewport render

[Campbell Barton]

Revision: 60951
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60951
Author:   campbellbarton
Date:     2013-10-26 22:38:12 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
fix [#37195] particles crash with viewport render

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c  
2013-10-26 19:35:30 UTC (rev 60950)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c  
2013-10-26 22:38:12 UTC (rev 60951)
@@ -1836,9 +1836,11 @@
                        if (strandbuf) {
                                int orignum = (index_mf_to_mpoly) ? 
DM_origindex_mface_mpoly(index_mf_to_mpoly, index_mp_to_orig, cpa->num) : 
cpa->num;
 
-                               if (orignum > sbound - strandbuf->bound) {
-                                       sbound= strandbuf->bound + orignum;
-                                       sbound->start= sbound->end= 
obr->totstrand;
+                               if ((orignum > sbound - strandbuf->bound) &&
+                                   (orignum < strandbuf->totbound))
+                               {
+                                       sbound = &strandbuf->bound[orignum];
+                                       sbound->start = sbound->end = 
obr->totstrand;
                                }
                        }
                }

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