From 35bb5465ae7f7fbd234b4b3c650902bc42f3d3f1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 10 Oct 2013 20:14:04 +0000 Subject: code cleanup: reuse rna_matrix_dimsize_NxN defines between RNA functions --- source/blender/makesrna/intern/rna_armature.c | 3 --- source/blender/makesrna/intern/rna_constraint.c | 1 - source/blender/makesrna/intern/rna_define.c | 5 +++++ source/blender/makesrna/intern/rna_object.c | 2 -- source/blender/makesrna/intern/rna_object_api.c | 2 -- source/blender/makesrna/intern/rna_object_force.c | 6 ++---- source/blender/makesrna/intern/rna_pose.c | 10 ++++------ source/blender/makesrna/intern/rna_scene.c | 4 +--- source/blender/makesrna/intern/rna_space.c | 5 ++--- source/blender/makesrna/intern/rna_tracking.c | 3 --- 10 files changed, 14 insertions(+), 27 deletions(-) (limited to 'source/blender/makesrna/intern') diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index b9cbbdb32f7..4b9f7ea32f6 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -471,9 +471,6 @@ static int rna_Armature_is_editmode_get(PointerRNA *ptr) #else -static int rna_matrix_dimsize_4x4[] = {4, 4}; -static int rna_matrix_dimsize_3x3[] = {3, 3}; - static void rna_def_bone_common(StructRNA *srna, int editbone) { PropertyRNA *prop; diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index f8483d7b221..0c7c2ea1e49 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -505,7 +505,6 @@ static void rna_def_constrainttarget(BlenderRNA *brna) static void rna_def_constraint_childof(BlenderRNA *brna) { - static int rna_matrix_dimsize_4x4[] = {4, 4}; StructRNA *srna; PropertyRNA *prop; diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index b153728050c..fe9e9573957 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -1253,6 +1253,11 @@ void RNA_def_property_array(PropertyRNA *prop, int length) } } +/* common args for length */ +const int rna_matrix_dimsize_3x3[] = {3, 3}; +const int rna_matrix_dimsize_4x4[] = {4, 4}; +const int rna_matrix_dimsize_4x2[] = {4, 2}; + void RNA_def_property_multi_array(PropertyRNA *prop, int dimension, const int length[]) { StructRNA *srna = DefRNA.laststruct; diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index dffdc988ca6..3f366dfbcfa 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1460,8 +1460,6 @@ int rna_Object_use_dynamic_topology_sculpting_get(PointerRNA *ptr) #else -static int rna_matrix_dimsize_4x4[] = {4, 4}; - static void rna_def_vertex_group(BlenderRNA *brna) { StructRNA *srna; diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 25ca231e58d..0f71e26b687 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -430,8 +430,6 @@ void RNA_api_object(StructRNA *srna) {0, NULL, 0, NULL, NULL} }; - static int rna_matrix_dimsize_4x4[] = {4, 4}; - #ifndef NDEBUG static EnumPropertyItem mesh_dm_info_items[] = { {0, "SOURCE", 0, "Source", "Source mesh"}, diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 146ba6e4b7d..33ae256c042 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -1540,8 +1540,6 @@ static void rna_def_softbody(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; - const int matrix_dimsize[] = {3, 3}; - static EnumPropertyItem collision_type_items[] = { {SBC_MODE_MANUAL, "MANUAL", 0, "Manual", "Manual adjust"}, @@ -1784,12 +1782,12 @@ static void rna_def_softbody(BlenderRNA *brna) /* matrix */ prop = RNA_def_property(srna, "rotation_estimate", PROP_FLOAT, PROP_MATRIX); RNA_def_property_float_sdna(prop, NULL, "lrot"); - RNA_def_property_multi_array(prop, 2, matrix_dimsize); + RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_3x3); RNA_def_property_ui_text(prop, "Rot Matrix", "Estimated rotation matrix"); prop = RNA_def_property(srna, "scale_estimate", PROP_FLOAT, PROP_MATRIX); RNA_def_property_float_sdna(prop, NULL, "lscale"); - RNA_def_property_multi_array(prop, 2, matrix_dimsize); + RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_3x3); RNA_def_property_ui_text(prop, "Scale Matrix", "Estimated scale matrix"); /***********************************************************************************/ diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index 58217206add..9c4e7f034cb 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -742,9 +742,7 @@ static void rna_def_pose_channel(BlenderRNA *brna) static float default_quat[4] = {1, 0, 0, 0}; /* default quaternion values */ static float default_axisAngle[4] = {0, 0, 1, 0}; /* default axis-angle rotation values */ static float default_scale[3] = {1, 1, 1}; /* default scale values */ - - const int matrix_dimsize[] = {4, 4}; - + StructRNA *srna; PropertyRNA *prop; @@ -841,13 +839,13 @@ static void rna_def_pose_channel(BlenderRNA *brna) /* transform matrices - should be read-only since these are set directly by AnimSys evaluation */ prop = RNA_def_property(srna, "matrix_channel", PROP_FLOAT, PROP_MATRIX); RNA_def_property_float_sdna(prop, NULL, "chan_mat"); - RNA_def_property_multi_array(prop, 2, matrix_dimsize); + RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Channel Matrix", "4x4 matrix, before constraints"); /* writable because it touches loc/scale/rot directly */ prop = RNA_def_property(srna, "matrix_basis", PROP_FLOAT, PROP_MATRIX); - RNA_def_property_multi_array(prop, 2, matrix_dimsize); + RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_ui_text(prop, "Basis Matrix", "Alternative access to location/scale/rotation relative to the parent and own rest bone"); RNA_def_property_float_funcs(prop, "rna_PoseChannel_matrix_basis_get", "rna_PoseChannel_matrix_basis_set", NULL); @@ -857,7 +855,7 @@ static void rna_def_pose_channel(BlenderRNA *brna) /* final matrix */ prop = RNA_def_property(srna, "matrix", PROP_FLOAT, PROP_MATRIX); RNA_def_property_float_sdna(prop, NULL, "pose_mat"); - RNA_def_property_multi_array(prop, 2, matrix_dimsize); + RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_float_funcs(prop, NULL, "rna_PoseChannel_matrix_set", NULL); RNA_def_property_ui_text(prop, "Pose Matrix", "Final 4x4 matrix after constraints and drivers are applied (object space)"); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 1e437423273..ff64d4c1775 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1589,14 +1589,12 @@ static void rna_def_transform_orientation(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; - - const int matrix_dimsize[] = {3, 3}; srna = RNA_def_struct(brna, "TransformOrientation", NULL); prop = RNA_def_property(srna, "matrix", PROP_FLOAT, PROP_MATRIX); RNA_def_property_float_sdna(prop, NULL, "mat"); - RNA_def_property_multi_array(prop, 2, matrix_dimsize); + RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_3x3); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index d494d6ae1cb..aee6b060221 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1684,7 +1684,6 @@ static void rna_def_space_view3d(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; - const int matrix_dimsize[] = {4, 4}; static EnumPropertyItem pivot_items[] = { {V3D_CENTER, "BOUNDING_BOX_CENTER", ICON_ROTATE, "Bounding Box Center", @@ -2104,12 +2103,12 @@ static void rna_def_space_view3d(BlenderRNA *brna) prop = RNA_def_property(srna, "perspective_matrix", PROP_FLOAT, PROP_MATRIX); RNA_def_property_float_sdna(prop, NULL, "persmat"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* XXX: for now, it's too risky for users to do this */ - RNA_def_property_multi_array(prop, 2, matrix_dimsize); + RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_ui_text(prop, "Perspective Matrix", "Current perspective matrix of the 3D region"); prop = RNA_def_property(srna, "view_matrix", PROP_FLOAT, PROP_MATRIX); RNA_def_property_float_sdna(prop, NULL, "viewmat"); - RNA_def_property_multi_array(prop, 2, matrix_dimsize); + RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); RNA_def_property_float_funcs(prop, NULL, "rna_RegionView3D_view_matrix_set", NULL); RNA_def_property_ui_text(prop, "View Matrix", "Current view matrix of the 3D region"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index 2b3cf58d452..97f5c24dc56 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -711,9 +711,6 @@ static EnumPropertyItem pattern_match_items[] = { {0, NULL, 0, NULL, NULL} }; -static int rna_matrix_dimsize_4x4[] = {4, 4}; -static int rna_matrix_dimsize_4x2[] = {4, 2}; - static void rna_def_trackingSettings(BlenderRNA *brna) { StructRNA *srna; -- cgit v1.2.3