archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* Merge trunk up to r39790.

Browse Source 
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.
This commit is contained in:
Joerg Mueller
2011-08-30 08:22:03 +00:00
parent 5b5e600db6 d049a722fe
commit 43ab8e8624
180 changed files with 6289 additions and 1990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/interface/interface_handlers.c
View File

@@ -800,8 +800,7 @@ static void ui_add_smart_controller(bContext *C, uiBut *from, uiBut *to)
if(!act_iter) return;
/* (3) add a new controller */
if (WM_operator_name_call(C, "LOGIC_OT_controller_add", WM_OP_EXEC_DEFAULT, NULL) & OPERATOR_FINISHED)
{
if (WM_operator_name_call(C, "LOGIC_OT_controller_add", WM_OP_EXEC_DEFAULT, NULL) & OPERATOR_FINISHED) {
cont = (bController *)ob->controllers.last;
/* (4) link the sensor->controller->actuator */