[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54762] trunk/blender/source/blender/ makesdna: Workaround for compilation error introduced in r54755

[Sergey Sharybin]

Revision: 54762
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54762
Author:   nazgul
Date:     2013-02-22 17:35:53 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
Workaround for compilation error introduced in r54755

Scons used to fail because of couple of reasons:

- CMake does have WITH_DNA_GHASH enabled, Scons not
  Which is a good question why?!
- This makes Cmake including BLI_utildefines in dna_genfile.c,
  but scons missed this include
- This damn "bool" thing requires BLI_utildefines

And last question here is why would we want to use bool here =\
It's just always ends up in headache without any visible benefit
of using it.

Well, at least now svn shall be compilable again..

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54755

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/SConscript
    trunk/blender/source/blender/makesdna/intern/dna_genfile.c

Modified: trunk/blender/source/blender/makesdna/SConscript
===================================================================
--- trunk/blender/source/blender/makesdna/SConscript	2013-02-22 16:42:19 UTC (rev 54761)
+++ trunk/blender/source/blender/makesdna/SConscript	2013-02-22 17:35:53 UTC (rev 54762)
@@ -32,6 +32,6 @@
 o = SConscript('intern/SConscript')
 objs += o
 
-incs = '#/intern/guardedalloc .'
+incs = '#/intern/guardedalloc . ../blenlib'
 
 env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['core','player'], priority = [215,200] )

Modified: trunk/blender/source/blender/makesdna/intern/dna_genfile.c
===================================================================
--- trunk/blender/source/blender/makesdna/intern/dna_genfile.c	2013-02-22 16:42:19 UTC (rev 54761)
+++ trunk/blender/source/blender/makesdna/intern/dna_genfile.c	2013-02-22 17:35:53 UTC (rev 54762)
@@ -42,8 +42,9 @@
 
 #include "MEM_guardedalloc.h" // for MEM_freeN MEM_mallocN MEM_callocN
 
+#include "BLI_utildefines.h"
+
 #ifdef WITH_DNA_GHASH
-#  include "BLI_utildefines.h"
 #  include "BLI_ghash.h"
 #endif