diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-07 15:51:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-07 15:51:03 +0300 |
commit | a98fc7500dec62b5ade17453b0277ce3be87762b (patch) | |
tree | 532fe2002c669c6f746834f72280c9350616f2af /source | |
parent | b5c2f9df95a0115de85dab9233082e98aff254c3 (diff) |
- fix for crash with constraint UI when using with a pinner object, with None active.
- fix for material UI when the pinned data was not a material.
- fix an error axis-angle drot label.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 3e04a6fe232..f776ee54a1c 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -825,11 +825,11 @@ uiLayout *uiTemplateModifier(uiLayout *layout, bContext *C, PointerRNA *ptr) #define REMAKEIPO 8 #define B_DIFF 9 -void do_constraint_panels(bContext *C, void *UNUSED(arg), int event) +void do_constraint_panels(bContext *C, void *ob_pt, int event) { Main *bmain= CTX_data_main(C); Scene *scene= CTX_data_scene(C); - Object *ob= CTX_data_active_object(C); + Object *ob= (Object *)ob_pt; switch(event) { case B_CONSTRAINT_TEST: @@ -898,7 +898,7 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con) /* unless button has own callback, it adds this callback to button */ block= uiLayoutGetBlock(layout); - uiBlockSetHandleFunc(block, do_constraint_panels, NULL); + uiBlockSetHandleFunc(block, do_constraint_panels, ob); uiBlockSetFunc(block, constraint_active_func, ob, con); RNA_pointer_create(&ob->id, &RNA_Constraint, con, &ptr); |