diff options
6 files changed, 7 insertions, 6 deletions
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 52a8408c41d..dd1930a241b 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -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 diff --git a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp index 560bbbdd244..c8ebb845bb6 100644 --- a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp +++ b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp @@ -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) { diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index a1f6b4bbd38..593744f01e0 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -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); diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 16fc796a7fe..5d7ff77e032 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -72,10 +72,7 @@ #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 diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 7b400e546ed..c11051d2a2e 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -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", \ diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index ae4d5dc493e..4c93d7f54f0 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -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" |