blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

fix [#37195] particles crash with viewport render

This commit is contained in:
Campbell Barton 2013-10-26 22:38:12 +00:00
parent 9f32e83175
commit 01da2c0e53
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build_files/scons/tools/Blender.py
View File

@ -675,6 +675,15 @@ def AppIt(target=None, source=None, env=None):
cmd = 'unzip -q %s/release/%s -d %s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,installdir,binary,VERSION)
commands.getoutput(cmd)
if env['XCODE_CUR_VER'] >= 5:
# For OSX 10.9/Xcode5 subcomponents also must be codesigned. To make this work we need a plist in the versioned libdir
# We copy for now the plist from main bundle, note: Blender must be run once before codesigning to have the py caches generated and taken into account
# After this we can run: codesign -s IDENTITY blender.app --deep
cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/Resources/'%(installdir,binary, VERSION)
commands.getoutput(cmd)
cmd = 'cp %s/%s.app/Contents/Info.plist %s/%s.app/Contents/MacOS/%s/Resources'%(installdir,binary,installdir,binary, VERSION)
commands.getoutput(cmd)
cmd = 'chmod +x %s/%s.app/Contents/MacOS/%s'%(installdir,binary, binary)
commands.getoutput(cmd)
cmd = 'find %s/%s.app -name .svn -prune -exec rm -rf {} \;'%(installdir, binary)

8
source/blender/render/intern/source/convertblender.c
View File

@ -1836,9 +1836,11 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
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;
}
}
}