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

[Sergey Sharybin]

Commit: 2589f55a55bc9682111ab266bb89d8f08713f374
Author: Sergey Sharybin
Date:   Thu Feb 15 12:33:44 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB2589f55a55bc9682111ab266bb89d8f08713f374

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/intern/particle_child.c
index bc4c32f5805,48ecdb04348..8cdd668b7e7
--- a/source/blender/blenkernel/intern/particle_child.c
+++ b/source/blender/blenkernel/intern/particle_child.c
@@@ -694,9 -813,11 +813,11 @@@ void do_child_modifiers(const ParticleC
  		rough_end *= ptex->roughe;
  	}
  
+ 	do_twist(modifier_ctx, state, t);
+ 
  	if (part->flag & PART_CHILD_EFFECT)
  		/* state is safe to cast, since only co and vel are used */
 -		guided = do_guides(sim->psys->part, sim->psys->effectors, (ParticleKey *)state, cpa->parent, t);
 +		guided = do_guides(sim->eval_ctx, sim->psys->part, sim->psys->effectors, (ParticleKey *)state, cpa->parent, t);
  
  	if (guided == 0) {
  		float orco_offset[3];
diff --cc source/blender/editors/space_view3d/drawobject.c
index 240eda4bf8e,c3823627009..75c217c4f0c
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@@ -5978,9 -5044,10 +5978,11 @@@ static void draw_new_particle_system
  		curvemapping_changed_all(psys->part->clumpcurve);
  	if ((psys->part->child_flag & PART_CHILD_USE_ROUGH_CURVE) && psys->part->roughcurve)
  		curvemapping_changed_all(psys->part->roughcurve);
+ 	if ((psys->part->child_flag & PART_CHILD_USE_TWIST_CURVE) && psys->part->twistcurve)
+ 		curvemapping_changed_all(psys->part->twistcurve);
  
  /* 2. */
 +	sim.eval_ctx = eval_ctx;
  	sim.scene = scene;
  	sim.ob = ob;
  	sim.psys = psys;
diff --cc source/blender/makesdna/DNA_particle_types.h
index ea7905eb2ad,9dbd1a18703..a7be2e37c4b
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@@ -260,9 -259,12 +260,14 @@@ typedef struct ParticleSettings 
  
  	/* modified dm support */
  	short use_modifier_stack;
 -	short pad5[3];
 +
 +	short pad5;
 +	int recalc;
+ 
+ 	float twist;
+ 	float pad6;
+ 	struct CurveMapping *twistcurve;
+ 	void *pad7;
  } ParticleSettings;
  
  typedef struct ParticleSystem {