diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-08-15 16:03:49 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-15 16:03:49 +0400 |
| commit | 0e7d0cfe2aa4f5f835c9ad62d01d77c37e7e6f7e (patch) | |
| tree | 41d5b235a73c1dca29fe9efe565552166c28c688 | |
| parent | 60a8fc375990534b304d2f1ca4bf7198d31f17d6 (diff) | |
[#23266] bpy.ops.poselib.browse_interactive - blend_factor argument does nothing
commenting 'blend_factor' for now, its not used.
COLOR and EULER internal pyrna subtypes were causing color type variables to try update euler rotation order.
| -rw-r--r-- | source/blender/editors/armature/poselib.c | 6 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_rna.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index 756dee2494b..b0b5aedaa70 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -1486,6 +1486,8 @@ void POSELIB_OT_browse_interactive (wmOperatorType *ot) /* properties */ // TODO: make the pose_index into a proper enum instead of a cryptic int... ot->prop= RNA_def_int(ot->srna, "pose_index", -1, -2, INT_MAX, "Pose", "Index of the pose to apply (-2 for no change to pose, -1 for poselib active pose)", 0, INT_MAX); - // XXX: percentage vs factor? - RNA_def_float_factor(ot->srna, "blend_factor", 1.0f, 0.0f, 1.0f, "Blend Factor", "Amount that the pose is applied on top of the existing poses", 0.0f, 1.0f); + + // XXX: percentage vs factor? + /* not used yet */ + /* RNA_def_float_factor(ot->srna, "blend_factor", 1.0f, 0.0f, 1.0f, "Blend Factor", "Amount that the pose is applied on top of the existing poses", 0.0f, 1.0f); */ } diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 9b2248d1ed4..e0a684bb767 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -63,11 +63,11 @@ static short pyrna_rotation_euler_order_get(PointerRNA *ptr, PropertyRNA **prop_ /* bpyrna vector/euler/quat callbacks */ static int mathutils_rna_array_cb_index= -1; /* index for our callbacks */ -/* not used yet but may want to use the subtype below */ +/* subtype not used much yet */ #define MATHUTILS_CB_SUBTYPE_EUL 0 #define MATHUTILS_CB_SUBTYPE_VEC 1 #define MATHUTILS_CB_SUBTYPE_QUAT 2 -#define MATHUTILS_CB_SUBTYPE_COLOR 0 +#define MATHUTILS_CB_SUBTYPE_COLOR 3 static int mathutils_rna_generic_check(BaseMathObject *bmo) { |