[Bf-blender-cvs] [911095d] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: 911095d372aa4942d3c2e2942db204df2e88a294
Author: Bastien Montagne
Date:   Thu Jan 21 09:45:18 2016 +0100
Branches: id-remap
https://developer.blender.org/rB911095d372aa4942d3c2e2942db204df2e88a294

Merge branch 'master' into id-remap

Conflicts:
	source/blender/editors/space_outliner/outliner_tools.c

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



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

diff --cc source/blender/editors/space_outliner/outliner_tools.c
index 5a7a05b,e88b4c2..ecc0f25
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@@ -1295,11 -1256,9 +1295,10 @@@ typedef enum eOutlinerLibOpTypes 
  
  static EnumPropertyItem outliner_lib_op_type_items[] = {
  	{OL_LIB_RENAME, "RENAME", 0, "Rename", ""},
 -	{OL_LIB_DELETE, "DELETE", 0, "Delete", "Delete this library and all its item from Blender (needs a save/reload)"},
 +    {OL_LIB_DELETE, "DELETE", 0, "Delete", "Delete this library and all its item from Blender - WARNING: no undo"},
 +    {OL_LIB_RELOCATE, "RELOCATE", 0, "Relocate", "Select a new path for this library, and reload all its data"},
 +    {OL_LIB_RELOAD, "RELOAD", 0, "Reload", "Reload all data from this library"},
  	{0, NULL, 0, NULL, NULL}
--
  };
  
  static int outliner_lib_operation_exec(bContext *C, wmOperator *op)