[Bf-blender-cvs] [bbbb5cad319] master: Fix T66277: Pinning Fluid Domain properties causes bake error

[Philipp Oeser]

Commit: bbbb5cad319e0e2c853b089cd3e1cbb83b447f67
Author: Philipp Oeser
Date:   Mon Jul 1 15:22:50 2019 +0200
Branches: master
https://developer.blender.org/rBbbbb5cad319e0e2c853b089cd3e1cbb83b447f67

Fix T66277: Pinning Fluid Domain properties causes bake error

Reviewers: brecht

Maniphest Tasks: T66277

Differential Revision: https://developer.blender.org/D5161

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

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 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;
   }