Merge branch 'master' into soc-2013-depsgraph_mt
[blender.git] / source / blender / render / intern / source / pipeline.c
index 4ec7ce1c0d284fcc6f8dd5c3b3eb624147b34106..78434427b18f0c5d93cbe71017f2e512f6f01704 100644 (file)
@@ -1622,6 +1622,7 @@ static bool allow_render_mesh_object(Object *ob)
        else if ((ob->transflag & OB_DUPLI) && !(ob->transflag & OB_DUPLIFRAMES)) {
                return false;
        }
+
        return true;
 }