[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43214] branches/bmesh/blender/source/ blender/render/intern/source/pipeline.c: Fix build break with double-definition of EXR stubs

Andrew Wiggin ender79bl at gmail.com
Sat Jan 7 22:16:25 CET 2012


Revision: 43214
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43214
Author:   ender79
Date:     2012-01-07 21:16:15 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
Fix build break with double-definition of EXR stubs

A better solution would be to mark all function in openexr_multi.h as forceinline or static, but this change just fixes it to work for the reason trunk works: the header defining the stubs is only needs to be included in one .c file

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/render/intern/source/pipeline.c

Modified: branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- branches/bmesh/blender/source/blender/render/intern/source/pipeline.c	2012-01-07 20:53:11 UTC (rev 43213)
+++ branches/bmesh/blender/source/blender/render/intern/source/pipeline.c	2012-01-07 21:16:15 UTC (rev 43214)
@@ -72,8 +72,6 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "intern/openexr/openexr_multi.h"
-
 #include "RE_engine.h"
 #include "RE_pipeline.h"
 



More information about the Bf-blender-cvs mailing list