Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-03-02 14:06:42 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-03-02 14:08:23 +0300
commitbc20a745bee32fa9d3f4d40c51c27798d50f581a (patch)
treed9b6f37411f73e86b8ca43cc51faee793ab943e6
parent4c723eb80e299eb6ca11ad72b5fcbe8746c4a854 (diff)
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.
-rw-r--r--source/blender/render/intern/source/convertblender.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index ba778ec30e9..01a347e37c7 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! */