Commit: 11f945a50ccf72b9faa75b196e0c9e53ca98a180
Author: Bastien Montagne
Date: Mon Jan 12 12:19:54 2015 +0100
Branches: temp_custom_loop_normals
https://developer.blender.org/rB11f945a50ccf72b9faa75b196e0c9e53ca98a180
Merge branch 'master' into temp_custom_loop_normals
Conflicts:
source/blender/makesrna/intern/rna_modifier.c
===================================================================
===================================================================
diff --cc source/blender/makesrna/intern/rna_modifier.c
index e55dfcd,9554b21..b63271d
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -69,9 -70,6 +70,8 @@@ EnumPropertyItem modifier_type_items[]
{eModifierType_WeightVGMix, "VERTEX_WEIGHT_MIX",
ICON_MOD_VERTEX_WEIGHT, "Vertex Weight Mix", ""},
{eModifierType_WeightVGProximity, "VERTEX_WEIGHT_PROXIMITY",
ICON_MOD_VERTEX_WEIGHT,
"Vertex Weight Proximity", ""},
- {eModifierType_DataTransfer, "DATA_TRANSFER", ICON_MOD_DATA_TRANSFER,
"Data Transfer", ""},
+ {eModifierType_SetSplitNormal, "SET_SPLIT_NORMAL",
ICON_MOD_SETSPLITNORMAL, "Set Split Normals", ""},
+ {eModifierType_CopySplitNormal, "COPY_SPLIT_NORMAL",
ICON_MOD_SETSPLITNORMAL, "Copy Split Normals", ""},
{0, "", 0, N_("Generate"), ""},
{eModifierType_Array, "ARRAY", ICON_MOD_ARRAY, "Array", ""},
{eModifierType_Bevel, "BEVEL", ICON_MOD_BEVEL, "Bevel", ""},
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
