[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50812] trunk/blender: code cleanup: remove/comment unused defines

[Campbell Barton]

Revision: 50812
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50812
Author:   campbellbarton
Date:     2012-09-22 13:40:31 +0000 (Sat, 22 Sep 2012)
Log Message:
-----------
code cleanup: remove/comment unused defines

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
    trunk/blender/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
    trunk/blender/source/blender/editors/interface/interface_handlers.c
    trunk/blender/source/blender/editors/space_logic/logic_window.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c
    trunk/blender/source/blender/makesrna/intern/rna_wm_api.c

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2012-09-22 13:23:12 UTC (rev 50811)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2012-09-22 13:40:31 UTC (rev 50812)
@@ -76,7 +76,7 @@
  */
 #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

Modified: trunk/blender/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp	2012-09-22 13:23:12 UTC (rev 50811)
+++ trunk/blender/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp	2012-09-22 13:40:31 UTC (rev 50812)
@@ -51,7 +51,7 @@
 
 /* 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)
 {

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-09-22 13:23:12 UTC (rev 50811)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-09-22 13:40:31 UTC (rev 50812)
@@ -1614,6 +1614,7 @@
 	
 	/* 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);
 

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c	2012-09-22 13:23:12 UTC (rev 50811)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2012-09-22 13:40:31 UTC (rev 50812)
@@ -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

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-09-22 13:23:12 UTC (rev 50811)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-09-22 13:40:31 UTC (rev 50812)
@@ -159,12 +159,13 @@
 #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", \

Modified: trunk/blender/source/blender/makesrna/intern/rna_wm_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm_api.c	2012-09-22 13:23:12 UTC (rev 50811)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm_api.c	2012-09-22 13:40:31 UTC (rev 50812)
@@ -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"