[Bf-blender-cvs] [e70c28e484e] fluid-mantaflow: fix for alembic mesh exporter

Sebastián Barschkis noreply at git.blender.org
Mon Nov 13 19:45:48 CET 2017


Commit: e70c28e484efb81d0e5e3f15e622e5c8b4577fa8
Author: Sebastián Barschkis
Date:   Mon Nov 13 19:45:34 2017 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBe70c28e484efb81d0e5e3f15e622e5c8b4577fa8

fix for alembic mesh exporter

liquids and smoke can both be of domain type. checking for smoke domain needed to be more specific, i.e. now checking domain type as well.

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

M	source/blender/alembic/intern/abc_exporter.cc

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

diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index 4fe65b96f36..dfcf0e2cf2d 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -42,6 +42,7 @@ extern "C" {
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_space_types.h"  /* for FILE_MAX */
+#include "DNA_smoke_types.h"
 
 #include "BLI_string.h"
 
@@ -102,7 +103,8 @@ static bool object_is_smoke_sim(Object *ob)
 
 	if (md) {
 		SmokeModifierData *smd = reinterpret_cast<SmokeModifierData *>(md);
-		return (smd->type == MOD_SMOKE_TYPE_DOMAIN);
+		return (smd->type == MOD_SMOKE_TYPE_DOMAIN && smd->domain &&
+				smd->domain->type == MOD_SMOKE_DOMAIN_TYPE_GAS);
 	}
 
 	return false;



More information about the Bf-blender-cvs mailing list