[Bf-blender-cvs] [e141527] fracture_modifier: Merge remote-tracking branch 'refs/remotes/origin/blender-v2.76-release' into fracture_modifier

[Martin Felke]

Commit: e141527ddb1586aa5ca3c92ee0b2dbd47a1521bc
Author: Martin Felke
Date:   Wed Nov 4 18:01:12 2015 +0100
Branches: fracture_modifier
https://developer.blender.org/rBe141527ddb1586aa5ca3c92ee0b2dbd47a1521bc

Merge remote-tracking branch 'refs/remotes/origin/blender-v2.76-release' into fracture_modifier

Conflicts:
	release/scripts/addons
	source/blender/windowmanager/intern/wm_operators.c

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



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

diff --cc source/blender/editors/interface/interface_templates.c
index 80faffc,44e130e..bd8ff61
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@@ -966,9 -966,9 +966,9 @@@ static uiLayout *draw_modifier
  			UI_block_lock_set(block, ob && ob->id.lib, ERROR_LIBDATA_MESSAGE);
  			
  			if (!ELEM(md->type, eModifierType_Fluidsim, eModifierType_Softbody, eModifierType_ParticleSystem,
 -			           eModifierType_Cloth, eModifierType_Smoke))
 +			           eModifierType_Cloth, eModifierType_Smoke, eModifierType_Fracture))
  			{
- 				uiItemO(row, CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Copy"), ICON_NONE,
+ 				uiItemO(row, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Copy"), ICON_NONE,
  				        "OBJECT_OT_modifier_copy");
  			}
  		}