[Bf-blender-cvs] [a075c8a0b4] transform-manipulators: Merge branch 'blender2.8' into transform-manipulators

[Julian Eisel]

Commit: a075c8a0b42419d2509a21ebd17460c5d7ad9d91
Author: Julian Eisel
Date:   Sat Jan 14 17:52:59 2017 +0100
Branches: transform-manipulators
https://developer.blender.org/rBa075c8a0b42419d2509a21ebd17460c5d7ad9d91

Merge branch 'blender2.8' into transform-manipulators

Conflicts:
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/space_view3d/view3d_ops.c
	source/blender/editors/transform/transform_manipulator.c

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



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

diff --cc source/blender/editors/physics/physics_ops.c
index d0cb7fd12a,0c907f1975..758ef43590
--- a/source/blender/editors/physics/physics_ops.c
+++ b/source/blender/editors/physics/physics_ops.c
@@@ -61,6 -107,79 +107,70 @@@ static void operatortypes_particle(void
  //	WM_operatortype_append(RIGIDBODY_OT_world_export);
  }
  
+ static void keymap_particle(wmKeyConfig *keyconf)
+ {
+ 	wmKeyMapItem *kmi;
+ 	wmKeyMap *keymap;
+ 	
+ 	keymap = WM_keymap_find(keyconf, "Particle", 0, 0);
+ 	keymap->poll = PE_poll;
+ 	
+ 	kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_select_all", AKEY, KM_PRESS, 0, 0);
+ 	RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
+ 	kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
+ 	RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
+ 
+ 	WM_keymap_add_item(keymap, "PARTICLE_OT_select_more", PADPLUSKEY, KM_PRESS, KM_CTRL, 0);
+ 	WM_keymap_add_item(keymap, "PARTICLE_OT_select_less", PADMINUS, KM_PRESS, KM_CTRL, 0);
+ 
+ 	kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_select_linked", LKEY, KM_PRESS, 0, 0);
+ 	RNA_boolean_set(kmi->ptr, "deselect", false);
+ 	kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_select_linked", LKEY, KM_PRESS, KM_SHIFT, 0);
+ 	RNA_boolean_set(kmi->ptr, "deselect", true);
+ 
+ 	WM_keymap_add_item(keymap, "PARTICLE_OT_delete", XKEY, KM_PRESS, 0, 0);
+ 	WM_keymap_add_item(keymap, "PARTICLE_OT_delete", DELKEY, KM_PRESS, 0, 0);
+ 
+ 	WM_keymap_add_item(keymap, "PARTICLE_OT_reveal", HKEY, KM_PRESS, KM_ALT, 0);
+ 	kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, 0, 0);
+ 	RNA_boolean_set(kmi->ptr, "unselected", false);
+ 	kmi = WM_keymap_add_item(keymap, "PARTICLE_OT_hide", HKEY, KM_PRESS, KM_SHIFT, 0);
+ 	RNA_boolean_set(kmi->ptr, "unselected", true);
+ 
 -	/* Shift+LMB behavior first, so it has priority over KM_ANY item below. */
 -	kmi = WM_keymap_verify_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
 -	RNA_boolean_set(kmi->ptr, "release_confirm", true);
 -	RNA_boolean_set(kmi->ptr, "use_planar_constraint", true);
 -	/* Using KM_ANY here to allow holding modifiers before starting to transform. */
 -	kmi = WM_keymap_add_item(keymap, "VIEW3D_OT_manipulator", LEFTMOUSE, KM_PRESS, KM_ANY, 0);
 -	RNA_boolean_set(kmi->ptr, "release_confirm", true);
 -	RNA_boolean_set(kmi->ptr, "use_planar_constraint", false);
 -
+ 	WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", LEFTMOUSE, KM_PRESS, 0, 0);
+ 	WM_keymap_add_item(keymap, "PARTICLE_OT_brush_edit", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
+ 
+ 	/* size radial control */
+ 	kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", FKEY, KM_PRESS, 0, 0);
+ 	RNA_string_set(kmi->ptr, "data_path_primary", "tool_settings.particle_edit.brush.size");
+ 
+ 	/* size radial control */
+ 	kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0);
+ 	RNA_string_set(kmi->ptr, "data_path_primary", "tool_settings.particle_edit.brush.strength");
+ 
+ 	WM_keymap_add_menu(keymap, "VIEW3D_MT_particle_specials", WKEY, KM_PRESS, 0, 0);
+ 	
+ 	WM_keymap_add_item(keymap, "PARTICLE_OT_weight_set", KKEY, KM_PRESS, KM_SHIFT, 0);
+ 
+ 	ED_keymap_proportional_cycle(keyconf, keymap);
+ 	ED_keymap_proportional_editmode(keyconf, keymap, false);
+ }
+ 
+ /******************************* boids *************************************/
+ 
+ static void operatortypes_boids(void)
+ {
+ 	WM_operatortype_append(BOID_OT_rule_add);
+ 	WM_operatortype_append(BOID_OT_rule_del);
+ 	WM_operatortype_append(BOID_OT_rule_move_up);
+ 	WM_operatortype_append(BOID_OT_rule_move_down);
+ 
+ 	WM_operatortype_append(BOID_OT_state_add);
+ 	WM_operatortype_append(BOID_OT_state_del);
+ 	WM_operatortype_append(BOID_OT_state_move_up);
+ 	WM_operatortype_append(BOID_OT_state_move_down);
+ }
+ 
  /********************************* fluid ***********************************/
  
  static void operatortypes_fluid(void)
diff --cc source/blender/editors/space_view3d/space_view3d.c
index be27033a92,90fa54c7a1..d1f3d587bd
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@@ -887,9 -878,9 +887,10 @@@ static void view3d_main_region_listener
  				case ND_MODIFIER:
  				case ND_CONSTRAINT:
  				case ND_KEYS:
+ 				case ND_PARTICLE:
  				case ND_LOD:
  					ED_region_tag_redraw(ar);
 +					WM_manipulatormap_tag_refresh(mmap);
  					break;
  			}
  			switch (wmn->action) {