[Bf-blender-cvs] [b8093409606] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: b809340960693a3e9808e59de4d1e029226fb492
Author: Bastien Montagne
Date:   Thu May 31 15:37:15 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb809340960693a3e9808e59de4d1e029226fb492

Merge branch 'master' into blender2.8

Conflicts:
	intern/cycles/blender/blender_curves.cpp
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/modifier.c
	source/blender/blenkernel/intern/object_update.c
	source/blender/blenkernel/intern/particle_system.c
	source/blender/editors/object/object_modifier.c
	source/blender/editors/physics/physics_fluid.c
	source/blender/makesrna/intern/rna_particle.c
	source/blender/modifiers/intern/MOD_particlesystem.c

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



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

diff --cc source/blender/blenkernel/BKE_modifier.h
index a7b491527f5,aacd2f99ff5..b5d3e67b970
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@@ -467,26 -430,30 +467,26 @@@ void test_object_modifiers(struct Objec
  void modifier_mdef_compact_influences(struct ModifierData *md);
  
  void        modifier_path_init(char *path, int path_maxlen, const char *name);
- const char *modifier_path_relbase(struct Object *ob);
+ const char *modifier_path_relbase(struct Main *bmain, struct Object *ob);
  
  
 -/* wrappers for modifier callbacks */
 +/* wrappers for modifier callbacks that ensure valid normals */
  
  struct DerivedMesh *modwrap_applyModifier(
 -        ModifierData *md, struct Object *ob,
 -        struct DerivedMesh *dm,
 -        ModifierApplyFlag flag);
 +        ModifierData *md, const struct ModifierEvalContext *ctx,
 +        struct DerivedMesh *dm);
  
  struct DerivedMesh *modwrap_applyModifierEM(
 -        ModifierData *md, struct Object *ob,
 -        struct BMEditMesh *em,
 -        struct DerivedMesh *dm,
 -        ModifierApplyFlag flag);
 +        ModifierData *md, const struct ModifierEvalContext *ctx,
 +        struct BMEditMesh *em, struct DerivedMesh *dm);
  
  void modwrap_deformVerts(
 -        ModifierData *md, struct Object *ob,
 +        ModifierData *md, const struct ModifierEvalContext *ctx,
          struct DerivedMesh *dm,
 -        float (*vertexCos)[3], int numVerts,
 -        ModifierApplyFlag flag);
 +        float (*vertexCos)[3], int numVerts);
  
  void modwrap_deformVertsEM(
 -        ModifierData *md, struct Object *ob,
 +        ModifierData *md, const struct ModifierEvalContext *ctx,
          struct BMEditMesh *em, struct DerivedMesh *dm,
          float (*vertexCos)[3], int numVerts);
  
diff --cc source/blender/blenkernel/intern/modifier.c
index 86563ab797d,50923901a36..1358951e240
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@@ -59,9 -58,7 +59,10 @@@
  #include "BLT_translation.h"
  
  #include "BKE_appdir.h"
 +#include "BKE_cdderivedmesh.h"
 +#include "BKE_editmesh.h"
+ #include "BKE_global.h"
 +#include "BKE_idcode.h"
  #include "BKE_key.h"
  #include "BKE_library.h"
  #include "BKE_library_query.h"
diff --cc source/blender/blenkernel/intern/particle_system.c
index 94abfe72b34,d8d59e9d2ac..88dd3de7fc4
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@@ -74,11 -74,10 +74,13 @@@
  #include "BKE_collision.h"
  #include "BKE_colortools.h"
  #include "BKE_effect.h"
++#include "BKE_global.h"
 +#include "BKE_library.h"
  #include "BKE_library_query.h"
+ #include "BKE_main.h"
  #include "BKE_particle.h"
  
 +#include "BKE_collection.h"
  #include "BKE_DerivedMesh.h"
  #include "BKE_object.h"
  #include "BKE_material.h"
@@@ -4308,7 -4302,7 +4310,7 @@@ void particle_system_update(struct Deps
  		}
  		case PART_FLUID:
  		{
- 			particles_fluid_step(&sim, (int)cfra, use_render_params);
 -			particles_fluid_step(bmain, &sim, (int)cfra, use_render_params);
++			particles_fluid_step(G.main  /* Yuck :/ */, &sim, (int)cfra, use_render_params);
  			break;
  		}
  		default:
diff --cc source/blender/editors/object/object_modifier.c
index 43cd65c55cd,08ef397b496..14bd8859ac2
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@@ -2197,7 -2175,7 +2199,7 @@@ static int ocean_bake_exec(bContext *C
  		 * this part of the process before a threaded job is created */
  		
  		//scene->r.cfra = f;
- 		//ED_update_for_newframe(CTX_data_main(C), scene);
 -		//ED_update_for_newframe(bmain, scene, 1);
++		//ED_update_for_newframe(bmain, scene);
  		
  		/* ok, this doesn't work with drivers, but is way faster. 
  		 * let's use this for now and hope nobody wants to drive the time value... */
diff --cc source/blender/editors/physics/physics_fluid.c
index 541242fdc09,c050f889eee..df8b4432e8b
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@@ -840,9 -836,8 +841,10 @@@ static void fluidsim_delete_until_lastf
  
  static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, short do_job)
  {
+ 	Main *bmain = CTX_data_main(C);
 -	Scene *scene= CTX_data_scene(C);
 +	Scene *scene = CTX_data_scene(C);
 +	ViewLayer *view_layer = CTX_data_view_layer(C);
 +	Depsgraph *depsgraph = CTX_data_depsgraph(C);
  	int i;
  	FluidsimSettings *domainSettings;