[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54529] trunk/blender/source/blender/ editors: fix for missing typecheck on hook-assign operator.
Campbell Barton
ideasman42 at gmail.com
Wed Feb 13 16:03:37 CET 2013
Revision: 54529
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54529
Author: campbellbarton
Date: 2013-02-13 15:03:36 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
fix for missing typecheck on hook-assign operator.
fix for POSELIB_OT_pose_rename getting an enum as an int.
Modified Paths:
--------------
trunk/blender/source/blender/editors/armature/poselib.c
trunk/blender/source/blender/editors/object/object_hook.c
Modified: trunk/blender/source/blender/editors/armature/poselib.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poselib.c 2013-02-13 14:11:04 UTC (rev 54528)
+++ trunk/blender/source/blender/editors/armature/poselib.c 2013-02-13 15:03:36 UTC (rev 54529)
@@ -663,7 +663,7 @@
}
/* get index (and pointer) of pose to remove */
- marker = BLI_findlink(&act->markers, RNA_int_get(op->ptr, "pose"));
+ marker = BLI_findlink(&act->markers, RNA_enum_get(op->ptr, "pose"));
if (marker == NULL) {
BKE_report(op->reports, RPT_ERROR, "Invalid index for pose");
return OPERATOR_CANCELLED;
Modified: trunk/blender/source/blender/editors/object/object_hook.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_hook.c 2013-02-13 14:11:04 UTC (rev 54528)
+++ trunk/blender/source/blender/editors/object/object_hook.c 2013-02-13 15:03:36 UTC (rev 54529)
@@ -798,7 +798,7 @@
ob = CTX_data_edit_object(C);
hmd = (HookModifierData *)BLI_findlink(&ob->modifiers, num);
}
- if (!ob || !hmd) {
+ if (!ob || !hmd || (hmd->modifier.type != eModifierType_Hook)) {
BKE_report(op->reports, RPT_ERROR, "Could not find hook modifier");
return OPERATOR_CANCELLED;
}
More information about the Bf-blender-cvs
mailing list