merge with/from trunk at r35190
[blender.git] / source / blender / editors / space_logic / logic_buttons.c
index 4f68dfb3804b1f28fcf36bf1252c97e59faffd4c..1450bc3b3b59e3943e3ffb9fd74930b98da64aa7 100644 (file)
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  * ***** END GPL LICENSE BLOCK *****
  */
 
-
 #include <string.h>
 #include <stdio.h>
 
 #include "DNA_meshdata_types.h"
 
-
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
 
 #include "ED_screen.h"
 
-
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -84,7 +82,7 @@ static void logic_panel_view_properties(const bContext *C, Panel *pa)
 }      
 #endif
 
-void logic_buttons_register(ARegionType *art)
+void logic_buttons_register(ARegionType *UNUSED(art))
 {
 #if 0
        PanelType *pt;
@@ -104,7 +102,7 @@ void logic_buttons_register(ARegionType *art)
 
 }
 
-static int logic_properties(bContext *C, wmOperator *op)
+static int logic_properties(bContext *C, wmOperator *UNUSED(op))
 {
        ScrArea *sa= CTX_wm_area(C);
        ARegion *ar= logic_has_buttons_region(sa);
@@ -200,6 +198,7 @@ void LOGIC_OT_links_cut(wmOperatorType *ot)
        
        ot->name= "Cut links";
        ot->idname= "LOGIC_OT_links_cut";
+       ot->description= "Remove logic brick connections";
        
        ot->invoke= WM_gesture_lines_invoke;
        ot->modal= WM_gesture_lines_modal;