code cleanup: remove/comment unused defines
authorCampbell Barton <ideasman42@gmail.com>
Sat, 22 Sep 2012 13:40:31 +0000 (13:40 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 22 Sep 2012 13:40:31 +0000 (13:40 +0000)
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
source/blender/editors/interface/interface_handlers.c
source/blender/editors/space_logic/logic_window.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_wm_api.c

index 52a8408c41d69b3cd1023296e3a17929b979c3db..dd1930a241b4c30d9eaa38c2e5b25a2d4af06b5f 100644 (file)
@@ -76,7 +76,7 @@ typedef struct {
  */
 #define _NET_WM_STATE_REMOVE 0
 #define _NET_WM_STATE_ADD 1
-#define _NET_WM_STATE_TOGGLE 2
+// #define _NET_WM_STATE_TOGGLE 2 // UNUSED
 
 /*
    import bpy
index 560bbbdd244d24a31c909ca87cc26ab016c3633e..c8ebb845bb670fa8578aec49d7fb3a6c881eaed9 100644 (file)
@@ -51,7 +51,7 @@ void DisplaceSimpleOperation::initExecution()
 
 /* minimum distance (in pixels) a pixel has to be displaced
  * in order to take effect */
-#define DISPLACE_EPSILON    0.01f
+// #define DISPLACE_EPSILON    0.01f
 
 void DisplaceSimpleOperation::executePixel(float output[4], float x, float y, PixelSampler sampler)
 {
index a1f6b4bbd38ab77f91f8952912bf06d11516811b..593744f01e0613f8821b9b43555a4dbf9d530e3b 100644 (file)
@@ -1614,6 +1614,7 @@ static int ui_textedit_copypaste(uiBut *but, uiHandleButtonData *data, int paste
        
        /* paste */
        if (paste) {
+               /* TODO, ensure UTF8 ui_is_but_utf8() - campbell */
                /* extract the first line from the clipboard */
                p = pbuf = WM_clipboard_text_get(0);
 
index 16fc796a7fe1bce976e882e9d56b1e43a006608d..5d7ff77e0329c2f9ab39d49d3d4784e2d67f45c5 100644 (file)
 
 #include "logic_intern.h"
 
-
-#define MAX_RENDER_PASS   100
 #define B_REDR         1
-#define B_IDNAME       2
 
 #define B_ADD_SENS             2703
 #define B_CHANGE_SENS          2704
index 7b400e546ed868f5b8b42198454a76ba1d77afce..c11051d2a2ef9ea147f99822d83b382b7dd9b681 100644 (file)
@@ -159,12 +159,13 @@ EnumPropertyItem snap_node_element_items[] = {
 #define R_IMF_ENUM_TAGA_RAW {R_IMF_IMTYPE_RAWTGA, "TARGA_RAW", ICON_FILE_IMAGE, "Targa Raw", \
                                                   "Output image in uncompressed Targa format"},
 
-
+#if 0 /* UNUSED (so far) */
 #ifdef WITH_DDS
 #  define R_IMF_ENUM_DDS {R_IMF_IMTYPE_DDS, "DDS", ICON_FILE_IMAGE, "DDS", "Output image in DDS format"},
 #else
 #  define R_IMF_ENUM_DDS
 #endif
+#endif
 
 #ifdef WITH_OPENJPEG
 #  define R_IMF_ENUM_JPEG2K {R_IMF_IMTYPE_JP2, "JPEG2000", ICON_FILE_IMAGE, "JPEG 2000", \
index ae4d5dc493e21fd31d6894bdbfe5c04106bf06e6..4c93d7f54f0c5f69349f4e7a52a1e48b7fdd7604 100644 (file)
@@ -39,6 +39,8 @@
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"
 
+#include "rna_internal.h"  /* own include */
+
 #ifdef RNA_RUNTIME
 
 #include "BKE_context.h"