From 912151763d0a217ba53e3d566fae655d1f8b8553 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 28 Apr 2014 13:20:37 +0200 Subject: Followup to rB8714ae09f894: better not have several RNA properties affect a single DNA one. --- source/blender/makesrna/intern/rna_constraint.c | 48 ++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'source/blender/makesrna/intern/rna_constraint.c') diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 1a18a1d8a31..5fbaae71482 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -1719,146 +1719,146 @@ static void rna_def_constraint_transform(BlenderRNA *brna) /* Rot */ prop = RNA_def_property(srna, "from_min_x_rot", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "from_min[0]"); + RNA_def_property_float_sdna(prop, NULL, "from_min_rot[0]"); RNA_def_property_ui_range(prop, DEG2RADF(-180.0f), DEG2RADF(180.0f), 10, 3); RNA_def_property_ui_text(prop, "From Minimum X", "Bottom range of X axis source motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "from_min_y_rot", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "from_min[1]"); + RNA_def_property_float_sdna(prop, NULL, "from_min_rot[1]"); RNA_def_property_ui_range(prop, DEG2RADF(-180.0f), DEG2RADF(180.0f), 10, 3); RNA_def_property_ui_text(prop, "From Minimum Y", "Bottom range of Y axis source motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "from_min_z_rot", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "from_min[2]"); + RNA_def_property_float_sdna(prop, NULL, "from_min_rot[2]"); RNA_def_property_ui_range(prop, DEG2RADF(-180.0f), DEG2RADF(180.0f), 10, 3); RNA_def_property_ui_text(prop, "From Minimum Z", "Bottom range of Z axis source motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "from_max_x_rot", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "from_max[0]"); + RNA_def_property_float_sdna(prop, NULL, "from_max_rot[0]"); RNA_def_property_ui_range(prop, DEG2RADF(-180.0f), DEG2RADF(180.0f), 10, 3); RNA_def_property_ui_text(prop, "From Maximum X", "Top range of X axis source motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "from_max_y_rot", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "from_max[1]"); + RNA_def_property_float_sdna(prop, NULL, "from_max_rot[1]"); RNA_def_property_ui_range(prop, DEG2RADF(-180.0f), DEG2RADF(180.0f), 10, 3); RNA_def_property_ui_text(prop, "From Maximum Y", "Top range of Y axis source motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "from_max_z_rot", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "from_max[2]"); + RNA_def_property_float_sdna(prop, NULL, "from_max_rot[2]"); RNA_def_property_ui_range(prop, DEG2RADF(-180.0f), DEG2RADF(180.0f), 10, 3); RNA_def_property_ui_text(prop, "From Maximum Z", "Top range of Z axis source motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "to_min_x_rot", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "to_min[0]"); + RNA_def_property_float_sdna(prop, NULL, "to_min_rot[0]"); RNA_def_property_ui_range(prop, DEG2RADF(-180.0f), DEG2RADF(180.0f), 10, 3); RNA_def_property_ui_text(prop, "To Minimum X", "Bottom range of X axis destination motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "to_min_y_rot", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "to_min[1]"); + RNA_def_property_float_sdna(prop, NULL, "to_min_rot[1]"); RNA_def_property_ui_range(prop, DEG2RADF(-180.0f), DEG2RADF(180.0f), 10, 3); RNA_def_property_ui_text(prop, "To Minimum Y", "Bottom range of Y axis destination motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "to_min_z_rot", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "to_min[2]"); + RNA_def_property_float_sdna(prop, NULL, "to_min_rot[2]"); RNA_def_property_ui_range(prop, DEG2RADF(-180.0f), DEG2RADF(180.0f), 10, 3); RNA_def_property_ui_text(prop, "To Minimum Z", "Bottom range of Z axis destination motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "to_max_x_rot", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "to_max[0]"); + RNA_def_property_float_sdna(prop, NULL, "to_max_rot[0]"); RNA_def_property_ui_range(prop, DEG2RADF(-180.0f), DEG2RADF(180.0f), 10, 3); RNA_def_property_ui_text(prop, "To Maximum X", "Top range of X axis destination motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "to_max_y_rot", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "to_max[1]"); + RNA_def_property_float_sdna(prop, NULL, "to_max_rot[1]"); RNA_def_property_ui_range(prop, DEG2RADF(-180.0f), DEG2RADF(180.0f), 10, 3); RNA_def_property_ui_text(prop, "To Maximum Y", "Top range of Y axis destination motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "to_max_z_rot", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "to_max[2]"); + RNA_def_property_float_sdna(prop, NULL, "to_max_rot[2]"); RNA_def_property_ui_range(prop, DEG2RADF(-180.0f), DEG2RADF(180.0f), 10, 3); RNA_def_property_ui_text(prop, "To Maximum Z", "Top range of Z axis destination motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); /* Scale */ prop = RNA_def_property(srna, "from_min_x_scale", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "from_min[0]"); + RNA_def_property_float_sdna(prop, NULL, "from_min_scale[0]"); RNA_def_property_ui_range(prop, -1000.0f, 1000.0f, 10, 3); RNA_def_property_ui_text(prop, "From Minimum X", "Bottom range of X axis source motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "from_min_y_scale", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "from_min[1]"); + RNA_def_property_float_sdna(prop, NULL, "from_min_scale[1]"); RNA_def_property_ui_range(prop, -1000.0f, 1000.0f, 10, 3); RNA_def_property_ui_text(prop, "From Minimum Y", "Bottom range of Y axis source motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "from_min_z_scale", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "from_min[2]"); + RNA_def_property_float_sdna(prop, NULL, "from_min_scale[2]"); RNA_def_property_ui_range(prop, -1000.0f, 1000.0f, 10, 3); RNA_def_property_ui_text(prop, "From Minimum Z", "Bottom range of Z axis source motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "from_max_x_scale", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "from_max[0]"); + RNA_def_property_float_sdna(prop, NULL, "from_max_scale[0]"); RNA_def_property_ui_range(prop, -1000.0f, 1000.0f, 10, 3); RNA_def_property_ui_text(prop, "From Maximum X", "Top range of X axis source motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "from_max_y_scale", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "from_max[1]"); + RNA_def_property_float_sdna(prop, NULL, "from_max_scale[1]"); RNA_def_property_ui_range(prop, -1000.0f, 1000.0f, 10, 3); RNA_def_property_ui_text(prop, "From Maximum Y", "Top range of Y axis source motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "from_max_z_scale", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "from_max[2]"); + RNA_def_property_float_sdna(prop, NULL, "from_max_scale[2]"); RNA_def_property_ui_range(prop, -1000.0f, 1000.0f, 10, 3); RNA_def_property_ui_text(prop, "From Maximum Z", "Top range of Z axis source motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "to_min_x_scale", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "to_min[0]"); + RNA_def_property_float_sdna(prop, NULL, "to_min_scale[0]"); RNA_def_property_ui_range(prop, -1000.0f, 1000.0f, 10, 3); RNA_def_property_ui_text(prop, "To Minimum X", "Bottom range of X axis destination motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "to_min_y_scale", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "to_min[1]"); + RNA_def_property_float_sdna(prop, NULL, "to_min_scale[1]"); RNA_def_property_ui_range(prop, -1000.0f, 1000.0f, 10, 3); RNA_def_property_ui_text(prop, "To Minimum Y", "Bottom range of Y axis destination motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "to_min_z_scale", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "to_min[2]"); + RNA_def_property_float_sdna(prop, NULL, "to_min_scale[2]"); RNA_def_property_ui_range(prop, -1000.0f, 1000.0f, 10, 3); RNA_def_property_ui_text(prop, "To Minimum Z", "Bottom range of Z axis destination motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "to_max_x_scale", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "to_max[0]"); + RNA_def_property_float_sdna(prop, NULL, "to_max_scale[0]"); RNA_def_property_ui_range(prop, -1000.0f, 1000.0f, 10, 3); RNA_def_property_ui_text(prop, "To Maximum X", "Top range of X axis destination motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "to_max_y_scale", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "to_max[1]"); + RNA_def_property_float_sdna(prop, NULL, "to_max_scale[1]"); RNA_def_property_ui_range(prop, -1000.0f, 1000.0f, 10, 3); RNA_def_property_ui_text(prop, "To Maximum Y", "Top range of Y axis destination motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "to_max_z_scale", PROP_FLOAT, PROP_NONE); - RNA_def_property_float_sdna(prop, NULL, "to_max[2]"); + RNA_def_property_float_sdna(prop, NULL, "to_max_scale[2]"); RNA_def_property_ui_range(prop, -1000.0f, 1000.0f, 10, 3); RNA_def_property_ui_text(prop, "To Maximum Z", "Top range of Z axis destination motion"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); -- cgit v1.2.3