Commit: 2d01210ea7f15838b139dd6c042f683033fe4bf8 Author: Nick Wu Date: Fri Aug 10 15:56:46 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB2d01210ea7f15838b139dd6c042f683033fe4bf8
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr
# Conflicts:
# release/datafiles/locale
# release/scripts/addons_contrib
# source/blender/editors/mesh/editmesh_tools.c
# source/blender/editors/space_outliner/outliner_draw.c
# source/blender/makesdna/DNA_modifier_types.h
# source/blender/makesrna/intern/rna_modifier.c
# source/blender/modifiers/MOD_modifiertypes.h
# source/blender/modifiers/intern/MOD_util.c
# source/tools
===================================================================
===================================================================
diff --cc source/blender/editors/mesh/mesh_intern.h
index fceaf6639f1,4a67dea9d4b..f0b5862f50f
--- a/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@@ -240,11 -240,21 +240,21 @@@ void MESH_OT_duplicate(struct wmOperato
void MESH_OT_merge(struct wmOperatorType *ot);
void MESH_OT_remove_doubles(struct wmOperatorType *ot);
void MESH_OT_poke(struct wmOperatorType *ot);
+ void MESH_OT_point_normals(struct wmOperatorType *ot);
+ void MESH_OT_merge_normals(struct wmOperatorType *ot);
+ void MESH_OT_split_normals(struct wmOperatorType *ot);
+ void MESH_OT_normals_tools(struct wmOperatorType *ot);
+ void MESH_OT_set_normals_from_faces(struct wmOperatorType *ot);
+ void MESH_OT_average_normals(struct wmOperatorType *ot);
+ void MESH_OT_smoothen_normals(struct wmOperatorType *ot);
+ void MESH_OT_mod_weighted_strength(struct wmOperatorType *ot);
+
+ struct wmKeyMap *point_normals_modal_keymap(wmKeyConfig *keyconf);
-#ifdef WITH_FREESTYLE
+//#ifdef WITH_FREESTYLE
void MESH_OT_mark_freestyle_edge(struct wmOperatorType *ot);
void MESH_OT_mark_freestyle_face(struct wmOperatorType *ot);
-#endif
+//#endif
/* *** mesh_data.c *** */
void MESH_OT_uv_texture_add(struct wmOperatorType *ot);
diff --cc source/blender/editors/space_outliner/outliner_draw.c
index e5ba3a78fcf,c52214b9846..115f5fa9057
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@@ -943,161 -943,159 +943,162 @@@ static void tselem_draw_icon
{
Object *ob = (Object *)tselem->id;
if (ob->type != OB_GPENCIL) {
- ModifierData *md =
BLI_findlink(&ob->modifiers, tselem->nr);
- switch ((ModifierType)md->type) {
- case eModifierType_Subsurf:
-
ICON_DRAW(ICON_MOD_SUBSURF);
- break;
- case eModifierType_Armature:
-
ICON_DRAW(ICON_MOD_ARMATURE);
- break;
- case eModifierType_Lattice:
-
ICON_DRAW(ICON_MOD_LATTICE);
- break;
- case eModifierType_Curve:
-
ICON_DRAW(ICON_MOD_CURVE);
- break;
- case eModifierType_Build:
-
ICON_DRAW(ICON_MOD_BUILD);
- break;
- case eModifierType_Mirror:
-
ICON_DRAW(ICON_MOD_MIRROR);
- break;
- case eModifierType_Decimate:
-
ICON_DRAW(ICON_MOD_DECIM);
- break;
- case eModifierType_Wave:
-
ICON_DRAW(ICON_MOD_WAVE);
- break;
- case eModifierType_Hook:
- ICON_DRAW(ICON_HOOK);
- break;
- case eModifierType_Softbody:
-
ICON_DRAW(ICON_MOD_SOFT);
- break;
- case eModifierType_Boolean:
-
ICON_DRAW(ICON_MOD_BOOLEAN);
- break;
- case
eModifierType_ParticleSystem:
-
ICON_DRAW(ICON_MOD_PARTICLES);
- break;
- case
eModifierType_ParticleInstance:
-
ICON_DRAW(ICON_MOD_PARTICLES);
- break;
- case eModifierType_EdgeSplit:
-
ICON_DRAW(ICON_MOD_EDGESPLIT);
- break;
- case eModifierType_Array:
-
ICON_DRAW(ICON_MOD_ARRAY);
- break;
- case eModifierType_UVProject:
- case eModifierType_UVWarp: /*
TODO, get own icon */
-
ICON_DRAW(ICON_MOD_UVPROJECT);
- break;
- case eModifierType_Displace:
-
ICON_DRAW(ICON_MOD_DISPLACE);
- break;
- case eModifierType_Shrinkwrap:
-
ICON_DRAW(ICON_MOD_SHRINKWRAP);
- break;
- case eModifierType_Cast:
-
ICON_DRAW(ICON_MOD_CAST);
- break;
- case eModifierType_MeshDeform:
- case
eModifierType_SurfaceDeform:
-
ICON_DRAW(ICON_MOD_MESHDEFORM);
- break;
- case eModifierType_Bevel:
-
ICON_DRAW(ICON_MOD_BEVEL);
- break;
- case eModifierType_Smooth:
- case
eModifierType_LaplacianSmooth:
- case
eModifierType_CorrectiveSmooth:
-
ICON_DRAW(ICON_MOD_SMOOTH);
- break;
- case eModifierType_SimpleDeform:
-
ICON_DRAW(ICON_MOD_SIMPLEDEFORM);
- break;
- case eModifierType_Mask:
-
ICON_DRAW(ICON_MOD_MASK);
- break;
- case eModifierType_Cloth:
-
ICON_DRAW(ICON_MOD_CLOTH);
- break;
- case eModifierType_Explode:
-
ICON_DRAW(ICON_MOD_EXPLODE);
- break;
- case eModifierType_Collision:
- case eModifierType_Surface:
-
ICON_DRAW(ICON_MOD_PHYSICS);
- break;
- case eModifierType_Fluidsim:
-
ICON_DRAW(ICON_MOD_FLUIDSIM);
- break;
- case eModifierType_Multires:
-
ICON_DRAW(ICON_MOD_MULTIRES);
- break;
- case eModifierType_Smoke:
-
ICON_DRAW(ICON_MOD_SMOKE);
- break;
- case eModifierType_Solidify:
-
ICON_DRAW(ICON_MOD_SOLIDIFY);
- break;
- case eModifierType_Screw:
-
ICON_DRAW(ICON_MOD_SCREW);
- break;
- case eModifierType_Remesh:
-
ICON_DRAW(ICON_MOD_REMESH);
- break;
- case eModifierType_WeightVGEdit:
- case eModifierType_WeightVGMix:
- case
eModifierType_WeightVGProximity:
-
ICON_DRAW(ICON_MOD_VERTEX_WEIGHT);
- break;
- case eModifierType_DynamicPaint:
-
ICON_DRAW(ICON_MOD_DYNAMICPAINT);
- break;
- case eModifierType_Ocean:
-
ICON_DRAW(ICON_MOD_OCEAN);
- break;
- case eModifierType_Warp:
-
ICON_DRAW(ICON_MOD_WARP);
- break;
- case eModifierType_Skin:
-
ICON_DRAW(ICON_MOD_SKIN);
- break;
- case eModifierType_Triangulate:
-
ICON_DRAW(ICON_MOD_TRIANGULATE);
- break;
- case eModifierType_MeshCache:
-
ICON_DRAW(ICON_MOD_MESHDEFORM); /* XXX, needs own icon */
- break;
- case
eModifierType_MeshSequenceCache:
-
ICON_DRAW(ICON_MOD_MESHDEFORM); /* XXX, needs own icon */
- break;
- case eModifierType_Wireframe:
-
ICON_DRAW(ICON_MOD_WIREFRAME);
- break;
- case
eModifierType_LaplacianDeform:
-
ICON_DRAW(ICON_MOD_MESHDEFORM); /* XXX, needs own icon */
- break;
- case eModifierType_DataTransfer:
-
ICON_DRAW(ICON_MOD_DATA_TRANSFER);
- break;
- case eModifierType_NormalEdit:
+ ModifierData *md = BLI_findlink(&ob->modifiers,
tselem->nr);
+ switch ((ModifierType)md->type) {
+ case eModifierType_Subsurf:
+ ICON_DRAW(ICON_MOD_SUBSURF);
+ break;
+ case eModifierType_Armature:
+ ICON_DRAW(ICON_MOD_ARMATURE);
+ break;
+ case eModifierType_Lattice:
+ ICON_DRAW(ICON_MOD_LATTICE);
+ break;
+ case eModifierType_Curve:
+ ICON_DRAW(ICON_MOD_CURVE);
+ break;
+ case eModifierType_Build:
+ ICON_DRAW(ICON_MOD_BUILD);
+ break;
+ case eModifierType_Mirror:
+ ICON_DRAW(ICON_MOD_MIRROR);
+ break;
+ case eModifierType_Decimate:
+ ICON_DRAW(ICON_MOD_DECIM);
+ break;
+ case eModifierType_Wave:
+ ICON_DRAW(ICON_MOD_WAVE);
+ break;
+ case eModifierType_Hook:
+ ICON_DRAW(ICON_HOOK);
+ break;
+ case eModifierType_Softbody:
+ ICON_DRAW(ICON_MOD_SOFT);
+ break;
+ case eModifierType_Boolean:
+ ICON_DRAW(ICON_MOD_BOOLEAN);
+ break;
+ case eModifierType_ParticleSystem:
+ ICON_DRAW(ICON_MOD_PARTICLES);
+ break;
+ case eModifierType_ParticleInstance:
+ ICON_DRAW(ICON_MOD_PARTICLES);
+ break;
+ case eModifierType_EdgeSplit:
+ ICON_DRAW(ICON_MOD_EDGESPLIT);
+ break;
+ case eModifierType_Array:
+ ICON_DRAW(ICON_MOD_ARRAY);
+ break;
+ case eModifierType_UVProject:
+ case eModifierType_UVWarp: /* TODO,
get own icon */
+ ICON_DRAW(ICON_MOD_UVPROJECT);
+ break;
+ case eModifierType_Displace:
+ ICON_DRAW(ICON_MOD_DISPLACE);
+ break;
+ case eModifierType_Shrinkwrap:
+ ICON_DRAW(ICON_MOD_SHRINKWRAP);
+ break;
+ case eModifierType_Cast:
+ ICON_DRAW(ICON_MOD_CAST);
+ break;
+ case eModifierType_MeshDeform:
+ case eModifierType_SurfaceDeform:
+ ICON_DRAW(ICON_MOD_MESHDEFORM);
+ break;
+ case eModifierType_Bevel:
+ ICON_DRAW(ICON_MOD_BEVEL);
+ break;
+ case eModifierType_Smooth:
+ case eModifierType_LaplacianSmooth:
+ case eModifierType_CorrectiveSmooth:
+ ICON_DRAW(ICON_MOD_SMOOTH);
+ break;
+ case eModifierType_SimpleDeform:
+
ICON_DRAW(ICON_MOD_SIMPLEDEFORM);
+ break;
+ case eModifierType_Mask:
+ ICON_DRAW(ICON_MOD_MASK);
+ break;
+ case eModifierType_Cloth:
+ ICON_DRAW(ICON_MOD_CLOTH);
+ break;
+ case eModifierType_Explode:
+ ICON_DRAW(ICON_MOD_EXPLODE);
+ break;
+ case eModifierType_Collision:
+ case eModifierType_Surface:
+ ICON_DRAW(ICON_MOD_PHYSICS);
+ break;
+ case eModifierType_Fluidsim:
+ ICON_DRAW(ICON_MOD_FLUIDSIM);
+ break;
+ case eModifierType_Multires:
+ ICON_DRAW(ICON_MOD_MULTIRES);
+ break;
+ case eModifierType_Smoke:
+ ICON_DRAW(ICON_MOD_SMOKE);
+ break;
+ case eModifierType_Solidify:
+ ICON_DRAW(ICON_MOD_SOLIDIFY);
+ break;
+ case eModifierType_Screw:
+ ICON_DRAW(ICON_MOD_SCREW);
+ break;
+ case eModifierType_Remesh:
+ ICON_DRAW(ICON_MOD_REMESH);
+ break;
+ case eModifierType_WeightVGEdit:
+ case eModifierType_WeightVGMix:
+ case eModifierType_WeightVGProximity:
+
ICON_DRAW(ICON_MOD_VERTEX_WEIGHT);
+ break;
+ case eModifierType_DynamicPaint:
+
ICON_DRAW(ICON_MOD_DYNAMICPAINT);
+ break;
+ case eModifierType_Ocean:
+ ICON_DRAW(ICON_MOD_OCEAN);
+ break;
+ case eModifierType_Warp:
+ ICON_DRAW(ICON_MOD_WARP);
+ break;
+ case eModifierType_Skin:
+ ICON_DRAW(ICON_MOD_SKIN);
+ break;
+ case eModifierType_Triangulate:
+ ICON_DRAW(ICON_MOD_TRIANGULATE);
+ break;
+ case eModifierType_MeshCache:
+ ICON_DRAW(ICON_MOD_MESHDEFORM);
/* XXX, needs own icon */
+ break;
+ case eModifierType_MeshSequenceCache:
+ ICON_DRAW(ICON_MOD_MESHDEFORM);
/* XXX, needs own icon */
+ b
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
