[Bf-blender-cvs] [0aa0865] fluid-mantaflow: made viewport switcher functional. now switching between geometry and render/preview works.

[Sebastián Barschkis]

Commit: 0aa086586acc0e7b562294194b40aee8f465f3b3
Author: Sebastián Barschkis
Date:   Sat Jul 16 12:58:11 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB0aa086586acc0e7b562294194b40aee8f465f3b3

made viewport switcher functional. now switching between geometry and render/preview works.

===================================================================

M	source/blender/blenkernel/intern/smoke.c

===================================================================

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index e68e6e0..f74857e 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2855,6 +2855,10 @@ static DerivedMesh *createLiquidMesh(SmokeDomainSettings *sds, DerivedMesh *orgd
 	if (!sds->fluid)
 		return NULL;
 	
+	/* just display original object */
+	if (sds->viewport_mode == 0)
+		return NULL;
+	
 	num_verts   = liquid_get_num_verts(sds->fluid);
 	num_normals = liquid_get_num_normals(sds->fluid);
 	num_faces   = liquid_get_num_triangles(sds->fluid);