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

[Campbell Barton]

Commit: 1bbddc8a1ed86ff94657e1e1acb34977a4c3a565
Author: Campbell Barton
Date:   Tue Aug 14 10:45:00 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB1bbddc8a1ed86ff94657e1e1acb34977a4c3a565

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/physics/particle_edit.c
index cb781dc2447,a03892a26d1..e722173bcfa
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@@ -1665,13 -1461,13 +1665,13 @@@ int PE_mouse_particles(bContext *C, con
  
  	/* 1 = nearest only */
  	if (extend)
- 		for_mouse_hit_keys(&data, extend_key_select, 1);
+ 		for_mouse_hit_keys(&data, extend_key_select, true);
  	else if (deselect)
- 		for_mouse_hit_keys(&data, deselect_key_select, 1);
+ 		for_mouse_hit_keys(&data, deselect_key_select, true);
  	else
- 		for_mouse_hit_keys(&data, toggle_key_select, 1);
+ 		for_mouse_hit_keys(&data, toggle_key_select, true);
  
 -	PE_update_selection(bmain, scene, ob, 1);
 +	PE_update_selection(data.depsgraph, scene, ob, 1);
  	WM_event_add_notifier(C, NC_OBJECT | ND_PARTICLE | NA_SELECTED, data.ob);
  
  	return OPERATOR_FINISHED;
@@@ -1900,8 -1696,8 +1900,8 @@@ static int select_linked_exec(bContext 
  	data.rad = 75.0f;
  	data.select = !RNA_boolean_get(op->ptr, "deselect");
  
- 	for_mouse_hit_keys(&data, select_keys, 1);  /* nearest only */
+ 	for_mouse_hit_keys(&data, select_keys, true);
 -	PE_update_selection(data.bmain, data.scene, data.ob, 1);
 +	PE_update_selection(data.depsgraph, data.scene, data.ob, 1);
  	WM_event_add_notifier(C, NC_OBJECT | ND_PARTICLE | NA_SELECTED, data.ob);
  
  	return OPERATOR_FINISHED;
@@@ -1946,11 -1742,12 +1946,11 @@@ void PE_deselect_all_visible(PTCacheEdi
  	}
  }
  
- int PE_border_select(bContext *C, rcti *rect, bool select, bool extend)
+ int PE_border_select(bContext *C, const rcti *rect, bool select, bool extend)
  {
 -	Main *bmain = CTX_data_main(C);
  	Scene *scene = CTX_data_scene(C);
  	Object *ob = CTX_data_active_object(C);
 -	PTCacheEdit *edit = PE_get_current(bmain, scene, ob);
 +	PTCacheEdit *edit = PE_get_current(scene, ob);
  	PEData data;
  
  	if (!PE_start_edit(edit))
@@@ -1963,9 -1760,9 +1963,9 @@@
  	data.rect = rect;
  	data.select = select;
  
- 	for_mouse_hit_keys(&data, select_key, 0);
+ 	for_mouse_hit_keys(&data, select_key, false);
  
 -	PE_update_selection(bmain, scene, ob, 1);
 +	PE_update_selection(data.depsgraph, scene, ob, 1);
  	WM_event_add_notifier(C, NC_OBJECT | ND_PARTICLE | NA_SELECTED, ob);
  
  	return OPERATOR_FINISHED;
@@@ -1988,9 -1786,9 +1988,9 @@@ int PE_circle_select(bContext *C, int s
  	data.rad = rad;
  	data.select = selecting;
  
- 	for_mouse_hit_keys(&data, select_key, 0);
+ 	for_mouse_hit_keys(&data, select_key, false);
  
 -	PE_update_selection(bmain, scene, ob, 1);
 +	PE_update_selection(data.depsgraph, scene, ob, 1);
  	WM_event_add_notifier(C, NC_OBJECT | ND_PARTICLE | NA_SELECTED, ob);
  
  	return OPERATOR_FINISHED;