real fix for Logic Bricks UI smart controller (#33746)

previous commit (54102) actually reintroduces an old bug where Blender sigfaults when
the sensor and controllers are not from the active object.

The real fix for report #33746 is to clear the "object" property after the operator ran.
I'm not sure why when I call the operator from command line the property is cleared, but not
when I called it from C. Either way all should be working now.
This commit is contained in:
Dalai Felinto 2013-01-26 03:30:21 +00:00
parent a8644deeef
commit 27eeb89bd9
2 changed files with 5 additions and 0 deletions

@ -880,6 +880,7 @@ static void ui_add_smart_controller(bContext *C, uiBut *from, uiBut *to)
RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
WM_operator_properties_create(&props_ptr, "LOGIC_OT_controller_add");
RNA_string_set(&props_ptr, "object", ob->id.name + 2);
/* (3) add a new controller */
if (WM_operator_name_call(C, "LOGIC_OT_controller_add", WM_OP_EXEC_DEFAULT, &props_ptr) & OPERATOR_FINISHED) {

@ -424,6 +424,10 @@ static int controller_add_exec(bContext *C, wmOperator *op)
WM_event_add_notifier(C, NC_LOGIC, NULL);
/* prevent the operator to get stuck with the "object" of the previous call -
* it only happens when it's called from the "smart controller", see bug #54102 */
RNA_string_set(op->ptr, "object", "");
return OPERATOR_FINISHED;
}