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

[Sergey Sharybin]

Commit: 2d89b43fd24986541f6cb2a1580ad8764540af47
Author: Sergey Sharybin
Date:   Fri Nov 17 15:00:27 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB2d89b43fd24986541f6cb2a1580ad8764540af47

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/uvedit/uvedit_unwrap_ops.c
index 8a742735a06,ce763243602..93a87096369
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@@ -1618,8 -1644,9 +1641,8 @@@ void ED_uvedit_unwrap_cube_project(BMes
  	BMFace *efa;
  	BMLoop *l;
  	BMIter iter, liter;
 -	/* MTexPoly *tf; */ /* UNUSED */
  	MLoopUV *luv;
- 	float *loc, dx, dy;
+ 	float loc[3];
  	int cox, coy;
  
  	int cd_loop_uv_offset;
@@@ -1671,10 -1708,13 +1704,13 @@@ static int cube_project_exec(bContext *
  		return OPERATOR_CANCELLED;
  	}
  
- 	ED_uvedit_unwrap_cube_project(obedit, em->bm, cube_size, true);
+ 	uv_map_transform_center(scene, v3d, center, obedit, em);
+ 
+ 	ED_uvedit_unwrap_cube_project(em->bm, cube_size, true, center);
+ 
  	uv_map_clip_correct(scene, obedit, em, op);
  
 -	DAG_id_tag_update(obedit->data, 0);
 +	DEG_id_tag_update(obedit->data, 0);
  	WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
  
  	return OPERATOR_FINISHED;
diff --cc source/blender/makesrna/intern/rna_particle.c
index b4a3fcac18f,53fe84707d1..0c85799fce7
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@@ -683,6 -675,7 +683,7 @@@ static void rna_Particle_reset_dependen
  static void rna_Particle_change_type(Main *bmain, Scene *scene, PointerRNA *ptr)
  {
  	particle_recalc(bmain, scene, ptr, PSYS_RECALC_RESET | PSYS_RECALC_TYPE);
 -	DAG_relations_tag_update(bmain);
++	DEG_relations_tag_update(bmain);
  }
  
  static void rna_Particle_change_physics(Main *bmain, Scene *scene, PointerRNA *ptr)
@@@ -777,11 -770,13 +778,14 @@@ static void rna_Particle_hair_dynamics_
  		psys->clmd->coll_parms->flags &= ~CLOTH_COLLSETTINGS_FLAG_SELF;
  		rna_Particle_redo(bmain, scene, ptr);
  	}
- 	else
+ 	else {
  		WM_main_add_notifier(NC_OBJECT | ND_PARTICLE | NA_EDITED, NULL);
+ 	}
  
 -	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 -	DAG_relations_tag_update(bmain);
 +	DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
++	DEG_relations_tag_update(bmain);
  }
++
  static PointerRNA rna_particle_settings_get(PointerRNA *ptr)
  {
  	ParticleSystem *psys = (ParticleSystem *)ptr->data;