[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54531] trunk/blender/source/blender/ editors/object/object_hook.c: ack, helps to compile before testing and committing :|
Campbell Barton
ideasman42 at gmail.com
Wed Feb 13 16:21:56 CET 2013
Revision: 54531
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54531
Author: campbellbarton
Date: 2013-02-13 15:21:55 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
ack, helps to compile before testing and committing :|
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_hook.c
Modified: trunk/blender/source/blender/editors/object/object_hook.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_hook.c 2013-02-13 15:14:29 UTC (rev 54530)
+++ trunk/blender/source/blender/editors/object/object_hook.c 2013-02-13 15:21:55 UTC (rev 54531)
@@ -386,15 +386,15 @@
}
}
-static void object_hook_from_context(bContext *C, PointerRNA *ptr,
+static void object_hook_from_context(bContext *C, PointerRNA *ptr, const int num,
Object **r_ob, HookModifierData **r_hmd)
{
Object *ob;
HookModifierData *hmd;
- if (ptr.data) { /* if modifier context is available, use that */
- ob = ptr.id.data;
- hmd = ptr.data;
+ if (ptr->data) { /* if modifier context is available, use that */
+ ob = ptr->id.data;
+ hmd = ptr->data;
}
else { /* use the provided property */
ob = CTX_data_edit_object(C);
@@ -689,7 +689,7 @@
Object *ob = NULL;
HookModifierData *hmd = NULL;
- object_hook_from_context(C, ptr, &ob, &hmd);
+ object_hook_from_context(C, &ptr, num, &ob, &hmd);
if (hmd == NULL) {
BKE_report(op->reports, RPT_ERROR, "Could not find hook modifier");
return OPERATOR_CANCELLED;
@@ -750,7 +750,7 @@
Scene *scene = CTX_data_scene(C);
float bmat[3][3], imat[3][3];
- object_hook_from_context(C, ptr, &ob, &hmd);
+ object_hook_from_context(C, &ptr, num, &ob, &hmd);
if (hmd == NULL) {
BKE_report(op->reports, RPT_ERROR, "Could not find hook modifier");
return OPERATOR_CANCELLED;
@@ -801,7 +801,7 @@
char name[MAX_NAME];
int *indexar, tot;
- object_hook_from_context(C, ptr, &ob, &hmd);
+ object_hook_from_context(C, &ptr, num, &ob, &hmd);
if (hmd == NULL) {
BKE_report(op->reports, RPT_ERROR, "Could not find hook modifier");
return OPERATOR_CANCELLED;
@@ -856,7 +856,7 @@
Object *ob = NULL;
HookModifierData *hmd = NULL;
- object_hook_from_context(C, ptr, &ob, &hmd);
+ object_hook_from_context(C, &ptr, num, &ob, &hmd);
if (hmd == NULL) {
BKE_report(op->reports, RPT_ERROR, "Could not find hook modifier");
return OPERATOR_CANCELLED;
More information about the Bf-blender-cvs
mailing list