[Bf-blender-cvs] [bc20a74] master: Fix T43859: Texture baking crashes blender
Sergey Sharybin
noreply at git.blender.org
Mon Mar 2 12:11:49 CET 2015
Commit: bc20a745bee32fa9d3f4d40c51c27798d50f581a
Author: Sergey Sharybin
Date: Mon Mar 2 16:06:42 2015 +0500
Branches: master
https://developer.blender.org/rBbc20a745bee32fa9d3f4d40c51c27798d50f581a
Fix T43859: Texture baking crashes blender
The issue was caused by particles using billboard distribution, which
requires either object to be specified or camera in the scene to be
existing.
This commit prevents backing from crash, but bake result might not be
totally expected because of the thing mentioned above.
===================================================================
M source/blender/render/intern/source/convertblender.c
===================================================================
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index ba778ec..01a347e 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -1321,6 +1321,9 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
if ((re->r.scemode & R_VIEWPORT_PREVIEW) && (ob->mode & OB_MODE_PARTICLE_EDIT))
return 0;
+ if (part->ren_as == PART_DRAW_BB && part->bb_ob == NULL && RE_GetCamera(re) == NULL)
+ return 0;
+
/* 2. start initializing things */
/* last possibility to bail out! */
More information about the Bf-blender-cvs
mailing list