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:
authorMatt Ebb <matt@mke3.net>2009-11-27 00:56:31 +0300
committerMatt Ebb <matt@mke3.net>2009-11-27 00:56:31 +0300
commitaf244d040382d4922519d0528b7c242c6aca5fcd (patch)
tree7f8bc0978f726ca86ef9e1d5f07ef3c52fec0130 /source/blender/render
parentb6ea97969072671bf279861df8414b4483a6fb25 (diff)
Fix for rev. 24908 - committed the fix, but it was commented out. Forgot to uncomment it after doublecheck testing, hmm...
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/convertblender.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index c29eabdcf65..f9d32f9c541 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -4501,8 +4501,8 @@ static int allow_render_object(Render *re, Object *ob, int nolamps, int onlysele
return 0;
/* don't add non-basic meta objects, ends up having renderobjects with no geometry */
- //if (ob!=find_basis_mball(re->scene, ob))
- // return 0;
+ if (ob!=find_basis_mball(re->scene, ob))
+ return 0;
if(nolamps && (ob->type==OB_LAMP))
return 0;