[Bf-blender-cvs] [06860ba29b5] master: Merge branch 'blender-v2.83-release'

[Philipp Oeser]

Commit: 06860ba29b517d1823b1dcd247363c99cc5af784
Author: Philipp Oeser
Date:   Fri May 22 17:21:52 2020 +0200
Branches: master
https://developer.blender.org/rB06860ba29b517d1823b1dcd247363c99cc5af784

Merge branch 'blender-v2.83-release'

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



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

diff --cc source/blender/editors/physics/physics_fluid.c
index ceaac201da3,d281320eb5a..8524870c15e
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@@ -154,9 -155,9 +155,9 @@@ static bool fluid_initjob
  {
    FluidModifierData *mmd = NULL;
    FluidDomainSettings *mds;
-   Object *ob = CTX_data_active_object(C);
+   Object *ob = ED_object_active_context(C);
  
 -  mmd = (FluidModifierData *)modifiers_findByType(ob, eModifierType_Fluid);
 +  mmd = (FluidModifierData *)BKE_modifiers_findby_type(ob, eModifierType_Fluid);
    if (!mmd) {
      BLI_strncpy(error_msg, N_("Bake failed: no Fluid modifier found"), error_size);
      return false;