Commit: 80d3eb6964941a314cd58135b80c78bd0cabe595
Author: Bastien Montagne
Date: Fri Jul 18 00:04:10 2014 +0200
https://developer.blender.org/rB80d3eb6964941a314cd58135b80c78bd0cabe595
Fix a BI bug: when an object had dupliobjects children, it was never rendered
at all,
even if having particle systems.
This was not matching behavior of Cycles and 3DView!
===================================================================
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 36fd1b2..5c44f1c 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -4791,13 +4791,12 @@ static int allow_render_object(Render *re, Object *ob,
int nolamps, int onlysele
{
if (is_object_hidden(re, ob))
return 0;
-
- /* override not showing object when duplis are used with particles */
- if (ob->transflag & OB_DUPLIPARTS) {
- /* pass */ /* let particle system(s) handle showing vs. not
showing */
- }
- else if ((ob->transflag & OB_DUPLI) && !(ob->transflag &
OB_DUPLIFRAMES)) {
- return 0;
+
+ /* Only handle dupli-hiding here if there is no particle systems. Else,
let those handle show/noshow. */
+ if (!ob->particlesystem.first) {
+ if ((ob->transflag & OB_DUPLI) && !(ob->transflag &
OB_DUPLIFRAMES)) {
+ return 0;
+ }
}
/* don't add non-basic meta objects, ends up having renderobjects with
no geometry */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
