Commit: bbd4a2355f9bf8b58ab4b4e93802cb9f19639a46
Author: Bastien Montagne
Date: Mon Feb 2 17:46:31 2015 +0100
Branches: temp_custom_loop_normals
https://developer.blender.org/rBbbd4a2355f9bf8b58ab4b4e93802cb9f19639a46
First round of changes from campbell's review.
Mostly renaming, not everything addressed yet.
===================================================================
M release/datafiles/blender_icons.svg
M release/scripts/startup/bl_ui/properties_data_modifier.py
M source/blender/blenlib/BLI_math_vector.h
M source/blender/blenlib/intern/math_vector.c
M source/blender/editors/include/UI_icons.h
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/CMakeLists.txt
M source/blender/modifiers/MOD_modifiertypes.h
A source/blender/modifiers/intern/MOD_normal_edit.c
D source/blender/modifiers/intern/MOD_setsplitnormal.c
M source/blender/modifiers/intern/MOD_util.c
===================================================================
diff --git a/release/datafiles/blender_icons.svg
b/release/datafiles/blender_icons.svg
index dbc5bef..f67d67f 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -90446,7 +90446,7 @@
</g>
<g
style="display:inline;enable-background:new"
- id="ICON_MOD_SETSPLITNORMAL"
+ id="ICON_MOD_NORMALEDIT"
transform="translate(105,-19)">
<rect
style="opacity:0;fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.79999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py
b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 0339fbf..d53bd04 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1340,10 +1340,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
sub.active = bool(md.vertex_group)
sub.prop(md, "invert_vertex_group", text="", icon='ARROW_LEFTRIGHT')
- def SET_SPLIT_NORMAL(self, layout, ob, md):
+ def NORMAL_EDIT(self, layout, ob, md):
has_vgroup = bool(md.vertex_group)
- needs_object_bbox_center = (((md.mode == 'ELLIPSOID') and not
md.target) or
- ((md.mode == 'TRACKTO') and
md.use_trackto_parallel))
+ needs_object_bbox_center = (((md.mode == 'RADIAL') and not md.target)
or
+ ((md.mode == 'DIRECTIONAL') and
md.use_directional_parallel))
row = layout.row()
row.prop(md, "mode", expand=True)
@@ -1358,8 +1358,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
col = split.column()
row = col.row(align=True)
- row.active = (md.mode == 'TRACKTO')
- row.prop(md, "use_trackto_parallel")
+ row.active = (md.mode == 'DIRECTIONAL')
+ row.prop(md, "use_directional_parallel")
col.prop(md, "use_current_normals")
split = layout.split()
diff --git a/source/blender/blenlib/BLI_math_vector.h
b/source/blender/blenlib/BLI_math_vector.h
index 4455e72..0f437b7 100644
--- a/source/blender/blenlib/BLI_math_vector.h
+++ b/source/blender/blenlib/BLI_math_vector.h
@@ -290,6 +290,8 @@ MINLINE void normal_float_to_short_v3(short r[3], const
float n[3]);
void minmax_v3v3_v3(float min[3], float max[3], const float vec[3]);
void minmax_v2v2_v2(float min[2], float max[2], const float vec[2]);
+void minmax_v3v3_v3_array(float r_min[3], float r_max[3], float (*vec_arr)[3],
int nbr);
+
void dist_ensure_v3_v3fl(float v1[3], const float v2[3], const float dist);
void dist_ensure_v2_v2fl(float v1[2], const float v2[2], const float dist);
diff --git a/source/blender/blenlib/intern/math_vector.c
b/source/blender/blenlib/intern/math_vector.c
index 887ec7d..d065fa7 100644
--- a/source/blender/blenlib/intern/math_vector.c
+++ b/source/blender/blenlib/intern/math_vector.c
@@ -757,6 +757,13 @@ void minmax_v2v2_v2(float min[2], float max[2], const
float vec[2])
if (max[1] < vec[1]) max[1] = vec[1];
}
+void minmax_v3v3_v3_array(float r_min[3], float r_max[3], float (*vec_arr)[3],
int nbr)
+{
+ while (nbr--) {
+ minmax_v3v3_v3(r_min, r_max, *vec_arr++);
+ }
+}
+
/** ensure \a v1 is \a dist from \a v2 */
void dist_ensure_v3_v3fl(float v1[3], const float v2[3], const float dist)
{
diff --git a/source/blender/editors/include/UI_icons.h
b/source/blender/editors/include/UI_icons.h
index 9f7e02d..bfb7a34 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -590,7 +590,7 @@ DEF_ICON(MOD_SKIN)
DEF_ICON(MOD_TRIANGULATE)
DEF_ICON(MOD_WIREFRAME)
DEF_ICON(MOD_DATA_TRANSFER)
-DEF_ICON(MOD_SETSPLITNORMAL)
+DEF_ICON(MOD_NORMALEDIT)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK169)
DEF_ICON(BLANK170)
diff --git a/source/blender/editors/space_outliner/outliner_draw.c
b/source/blender/editors/space_outliner/outliner_draw.c
index c6e0244..1aa3fc2 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1020,8 +1020,8 @@ static void tselem_draw_icon(uiBlock *block, int xmax,
float x, float y, TreeSto
UI_icon_draw(x, y,
ICON_MOD_MESHDEFORM); break; /* XXX, needs own icon */
case eModifierType_DataTransfer:
UI_icon_draw(x, y,
ICON_MOD_DATA_TRANSFER); break;
- case eModifierType_SetSplitNormal:
- UI_icon_draw(x, y,
ICON_MOD_SETSPLITNORMAL); break;
+ case eModifierType_NormalEdit:
+ UI_icon_draw(x, y,
ICON_MOD_NORMALEDIT); break;
/* Default */
case eModifierType_None:
case eModifierType_ShapeKey:
diff --git a/source/blender/makesdna/DNA_modifier_types.h
b/source/blender/makesdna/DNA_modifier_types.h
index 030960b..86b202e 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -83,7 +83,7 @@ typedef enum ModifierType {
eModifierType_LaplacianDeform = 47,
eModifierType_Wireframe = 48,
eModifierType_DataTransfer = 49,
- eModifierType_SetSplitNormal = 50,
+ eModifierType_NormalEdit = 50,
NUM_MODIFIER_TYPES
} ModifierType;
@@ -1421,7 +1421,7 @@ enum {
};
/* Set Split Normals modifier */
-typedef struct SetSplitNormalModifierData {
+typedef struct NormalEditModifierData {
ModifierData modifier;
char defgrp_name[64]; /* MAX_VGROUP_NAME */
struct Object *target; /* Source of normals, or center of ellipsoid. */
@@ -1431,28 +1431,28 @@ typedef struct SetSplitNormalModifierData {
short pad_s1;
float mix_factor;
float pad_f1;
-} SetSplitNormalModifierData;
+} NormalEditModifierData;
-/* SetSplitNormalModifierData.mode */
+/* NormalEditModifierData.mode */
enum {
- MOD_SETSPLITNORMAL_MODE_ELLIPSOID = 0,
- MOD_SETSPLITNORMAL_MODE_TRACKTO = 1,
+ MOD_NORMALEDIT_MODE_RADIAL = 0,
+ MOD_NORMALEDIT_MODE_DIRECTIONAL = 1,
};
-/* SetSplitNormalModifierData.flags */
+/* NormalEditModifierData.flags */
enum {
- MOD_SETSPLITNORMAL_INVERT_VGROUP = (1 << 0),
- MOD_SETSPLITNORMAL_CENTER_BBOX = (1 << 1),
- MOD_SETSPLITNORMAL_USE_CURCLNORS = (1 << 2),
- MOD_SETSPLITNORMAL_USE_PARALLEL_TRACKTO = (1 << 3),
+ MOD_NORMALEDIT_INVERT_VGROUP = (1 << 0),
+ MOD_NORMALEDIT_CENTER_BBOX = (1 << 1),
+ MOD_NORMALEDIT_USE_CURCLNORS = (1 << 2),
+ MOD_NORMALEDIT_USE_PARALLEL_DIRECTIONAL = (1 << 3),
};
-/* SetSplitNormalModifierData.mix_mode */
+/* NormalEditModifierData.mix_mode */
enum {
- MOD_SETSPLITNORMAL_MIX_COPY = 0,
- MOD_SETSPLITNORMAL_MIX_ADD = 1,
- MOD_SETSPLITNORMAL_MIX_SUB = 2,
- MOD_SETSPLITNORMAL_MIX_MUL = 3,
+ MOD_NORMALEDIT_MIX_COPY = 0,
+ MOD_NORMALEDIT_MIX_ADD = 1,
+ MOD_NORMALEDIT_MIX_SUB = 2,
+ MOD_NORMALEDIT_MIX_MUL = 3,
};
#endif /* __DNA_MODIFIER_TYPES_H__ */
diff --git a/source/blender/makesrna/RNA_access.h
b/source/blender/makesrna/RNA_access.h
index 3b71e58..a62a06f 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -494,7 +494,7 @@ extern StructRNA RNA_SequenceEditor;
extern StructRNA RNA_SequenceElement;
extern StructRNA RNA_SequenceProxy;
extern StructRNA RNA_SequenceTransform;
-extern StructRNA RNA_SetSplitNormalModifier;
+extern StructRNA RNA_NormalEditModifier;
extern StructRNA RNA_ShaderNode;
extern StructRNA RNA_ShaderNodeCameraData;
extern StructRNA RNA_ShaderNodeCombineRGB;
diff --git a/source/blender/makesrna/intern/rna_modifier.c
b/source/blender/makesrna/intern/rna_modifier.c
index 75f46d7..544043d 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -65,7 +65,7 @@ EnumPropertyItem modifier_type_items[] = {
{0, "", 0, N_("Modify"), ""},
{eModifierType_DataTransfer, "DATA_TRANSFER", ICON_MOD_DATA_TRANSFER,
"Data Transfer", ""},
{eModifierType_MeshCache, "MESH_CACHE", ICON_MOD_MESHDEFORM, "Mesh
Cache", ""},
- {eModifierType_SetSplitNormal, "SET_SPLIT_NORMAL",
ICON_MOD_SETSPLITNORMAL, "Set Split Normals", ""},
+ {eModifierType_NormalEdit, "NORMAL_EDIT", ICON_MOD_NORMALEDIT, "Normal
Edit", ""},
{eModifierType_UVProject, "UV_PROJECT", ICON_MOD_UVPROJECT, "UV
Project", ""},
{eModifierType_UVWarp, "UV_WARP", ICON_MOD_UVPROJECT, "UV Warp", ""},
{eModifierType_WeightVGEdit, "VERTEX_WEIGHT_EDIT",
ICON_MOD_VERTEX_WEIGHT, "Vertex Weight Edit", ""},
@@ -359,8 +359,8 @@ static StructRNA *rna_Modifier_refine(struct PointerRNA
*ptr)
return &RNA_WireframeModifier;
case eModifierType_DataTransfer:
return &RNA_DataTransferModifier;
- case eModifierType_SetSplitNormal:
- return &RNA_SetSplitNormalModifier;
+ case eModifierType_NormalEdit:
+ return &RNA_NormalEditModifier;
/* Default */
case eModifierType_None:
case eModifierType_ShapeKey:
@@ -435,7 +435,7 @@ RNA_MOD_VGROUP_NAME_SET(LaplacianSmooth, defgrp_name);
RNA_MOD_VGROUP_NAME_SET(Lattice, name);
RNA_MOD_VGROUP_NAME_SET(Mask, vgroup);
RNA_MOD_VGROUP_NAME_SET(MeshDeform, defgrp_name);
-RNA_MOD_VGROUP_NAME_SET(SetSplitNormal, defgrp_name);
+RNA_MOD_VGROUP_NAME_SET(NormalEdit, defgrp_name);
RNA_MOD_VGROUP_NAME_SET(Shrinkwrap, vgroup_name);
RNA_MOD_VGROUP_NAME_SET(SimpleDeform, vgroup_name);
RNA_MOD_VGROUP_NAME_SET(Smooth, defgrp_name);
@@ -522,7 +522,7 @@ RNA_MOD_OBJECT_SET(DataTransfer, ob_source, OB_MESH);
RNA_MOD_OBJECT_SET(Lattice, object, OB_LATTICE);
RNA_MOD_OBJECT_SET(Mask, ob_arm, OB_ARMATURE);
RNA_MOD_OBJECT_SET(MeshDeform, object, OB_MESH);
-RNA_MOD_OBJECT_SET(SetSplitNormal, target, OB_EMPTY);
+RNA_MOD_OBJECT_SET(NormalEdit, target, OB_EMPTY);
RNA_MOD_OBJECT_SET(Shrinkwrap, target, OB_MESH);
RNA_MOD_OBJECT_SET(Shrinkwrap, auxTarget, OB_MESH);
@@ -4344,31 +4344,31 @@ static void rna_def_modifier_datatransfer(BlenderRNA
*brna)
RNA_def_property_update(prop, 0, "rna_Modifier_update");
}
-static void rna_def_modifier_setsplitnormal(BlenderRNA *brna)
+static void rna_def_modifier_normaledit(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
static EnumPropertyItem prop_mode_items[] = {
- {MOD_SETSPLITNORMAL_MODE_ELLIPSOID, "ELLIPSOID", 0, "Ellipsoid",
+ {MOD_NORMALEDI
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
