[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60622] trunk/blender/source/blender/imbuf : fix building when WITH_PSD is OFF, stub is not needed afterall
Dalai Felinto
dfelinto at gmail.com
Wed Oct 9 04:33:44 CEST 2013
Revision: 60622
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60622
Author: dfelinto
Date: 2013-10-09 02:33:44 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
fix building when WITH_PSD is OFF, stub is not needed afterall
Modified Paths:
--------------
trunk/blender/source/blender/imbuf/CMakeLists.txt
Removed Paths:
-------------
trunk/blender/source/blender/imbuf/intern/oiio/openimageio_stub.cpp
Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/CMakeLists.txt 2013-10-08 21:17:24 UTC (rev 60621)
+++ trunk/blender/source/blender/imbuf/CMakeLists.txt 2013-10-09 02:33:44 UTC (rev 60622)
@@ -108,10 +108,6 @@
if(WITH_IMAGE_PSD)
add_definitions(-DWITH_PSD)
-else()
- list(APPEND SRC
- intern/oiio/openimageio_stub.cpp
- )
endif()
if(WITH_IMAGE_OPENJPEG)
Deleted: trunk/blender/source/blender/imbuf/intern/oiio/openimageio_stub.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/oiio/openimageio_stub.cpp 2013-10-08 21:17:24 UTC (rev 60621)
+++ trunk/blender/source/blender/imbuf/intern/oiio/openimageio_stub.cpp 2013-10-09 02:33:44 UTC (rev 60622)
@@ -1,35 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2013 Blender Foundation
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s):
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-
-/** \file blender/imbuf/intern/oiio/openimageio_api.h
- * \ingroup openimageio
- */
-
-#include "openimageio_api.h"
-
-#endif
More information about the Bf-blender-cvs
mailing list