[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48026] trunk/blender/source/blender/ editors/io: Forgot to define WITH_COLLADA in SCons in recent commit

[Sergey Sharybin]

Revision: 48026
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48026
Author:   nazgul
Date:     2012-06-18 09:48:47 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Forgot to define WITH_COLLADA in SCons in recent commit

Also fix some issues with header files:
- Added ifndef .. define .. endif blocks to be sure headers are not
  including twice.
- DO not include WM stuff in headers, use anonymous structure names instead.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/io/SConscript
    trunk/blender/source/blender/editors/io/io_collada.h
    trunk/blender/source/blender/editors/io/io_ops.h

Modified: trunk/blender/source/blender/editors/io/SConscript
===================================================================
--- trunk/blender/source/blender/editors/io/SConscript	2012-06-18 09:20:49 UTC (rev 48025)
+++ trunk/blender/source/blender/editors/io/SConscript	2012-06-18 09:48:47 UTC (rev 48026)
@@ -8,4 +8,7 @@
 incs = '../include ../../blenfont ../../blenkernel ../../blenlib ../../blenloader ../../bmesh'
 incs += '../../makesdna ../../makesrna ../../windowmanager ../../collada'
 
+if env['WITH_BF_COLLADA']:
+    defs += 'WITH_COLLADA'
+
 env.BlenderLib ( 'bf_editor_io', sources, Split(incs), defines=defs, libtype=['core','player'], priority=[330,210] )

Modified: trunk/blender/source/blender/editors/io/io_collada.h
===================================================================
--- trunk/blender/source/blender/editors/io/io_collada.h	2012-06-18 09:20:49 UTC (rev 48025)
+++ trunk/blender/source/blender/editors/io/io_collada.h	2012-06-18 09:48:47 UTC (rev 48026)
@@ -28,8 +28,12 @@
  *  \ingroup editor/io
  */
 
-#include "WM_types.h"
-#include "WM_api.h"
+#ifndef __IO_COLLADA_H__
+#define __IO_COLLADA_H__
 
-extern void WM_OT_collada_export(wmOperatorType *ot);
-extern void WM_OT_collada_import(wmOperatorType *ot);
+struct wmOperatorType;
+
+void WM_OT_collada_export(struct wmOperatorType *ot);
+void WM_OT_collada_import(struct wmOperatorType *ot);
+
+#endif

Modified: trunk/blender/source/blender/editors/io/io_ops.h
===================================================================
--- trunk/blender/source/blender/editors/io/io_ops.h	2012-06-18 09:20:49 UTC (rev 48025)
+++ trunk/blender/source/blender/editors/io/io_ops.h	2012-06-18 09:48:47 UTC (rev 48026)
@@ -28,4 +28,9 @@
  *  \ingroup editor/io
  */
 
-extern void ED_operatortypes_io(void);
+#ifndef __IO_OPS_H__
+#define __IO_OPS_H__
+
+void ED_operatortypes_io(void);
+
+#endif