Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2019-07-01 16:22:50 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-07-01 16:47:43 +0300
commitbbbb5cad319e0e2c853b089cd3e1cbb83b447f67 (patch)
tree39c3bfe0dd148559135f540f47cba3b924187f7c /source/blender/editors/physics/physics_fluid.c
parent28fee762ae7c430d60fde9eea0c7bb2dbdb3a239 (diff)
Fix T66277: Pinning Fluid Domain properties causes bake error
Reviewers: brecht Maniphest Tasks: T66277 Differential Revision: https://developer.blender.org/D5161
Diffstat (limited to 'source/blender/editors/physics/physics_fluid.c')
-rw-r--r--source/blender/editors/physics/physics_fluid.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index dc4ce138d9d..dc3673c972f 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -46,6 +46,7 @@
#include "DEG_depsgraph.h"
#include "ED_screen.h"
+#include "ED_object.h"
#include "WM_types.h"
#include "WM_api.h"
@@ -1216,7 +1217,7 @@ static int fluid_bake_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(
return OPERATOR_CANCELLED;
}
- if (!fluidsimBake(C, op->reports, CTX_data_active_object(C), true)) {
+ if (!fluidsimBake(C, op->reports, ED_object_context(C), true)) {
return OPERATOR_CANCELLED;
}