[Bf-blender-cvs] [8537dcc] soc-2014-fluid: runtime error in abscent FLUID_3D obj seems corrected

Roman Pogribnyi noreply at git.blender.org
Tue Aug 12 00:57:03 CEST 2014


Commit: 8537dccb308edf4e9f48c2c5bf1b70d9084d7c4a
Author: Roman Pogribnyi
Date:   Mon Aug 11 21:48:16 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rB8537dccb308edf4e9f48c2c5bf1b70d9084d7c4a

runtime error in abscent FLUID_3D obj seems corrected

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

M	source/blender/editors/physics/physics_fluid.c

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

diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index 4baeea0..679c608 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -1153,6 +1153,11 @@ static int manta_make_file_exec(bContext *C, wmOperator *op)
 	SmokeModifierData *smd;
 	Object * smokeDomain = CTX_data_active_object(C);
 	smd = (SmokeModifierData *)modifiers_findByType(smokeDomain, eModifierType_Smoke);
+	if (smd->domain->fluid == NULL)
+	{
+		smoke_reallocate_fluid(smd->domain, 0.1,smd->domain->res, 1);
+//		smd->domain->fluid = smoke_init(smd->domain->res, 0.1f, 0.1f, 0,0,0);
+	}
 	smoke_mantaflow_write_scene_file(scene, smd);
 
 	/*	return OPERATOR_CANCELLED;*/




More information about the Bf-blender-cvs mailing list