[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59516] trunk/blender: Remove (comment out ) auto-generating png form svg (r59382) in CMake, handy but gives nasty " false changes" in svn.

Bastien Montagne montagne29 at wanadoo.fr
Mon Aug 26 14:16:24 CEST 2013


Revision: 59516
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59516
Author:   mont29
Date:     2013-08-26 12:16:23 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Remove (comment out) auto-generating png form svg (r59382) in CMake, handy but gives nasty "false changes" in svn. Let's try not to forget to update PNGs when needed, then!

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

Modified Paths:
--------------
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/source/blender/editors/datafiles/CMakeLists.txt

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2013-08-26 12:09:13 UTC (rev 59515)
+++ trunk/blender/build_files/cmake/macros.cmake	2013-08-26 12:16:23 UTC (rev 59516)
@@ -802,6 +802,7 @@
 
 endmacro()
 
+# XXX Not used for now...
 macro(svg_to_png
       file_from
       file_to

Modified: trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/datafiles/CMakeLists.txt	2013-08-26 12:09:13 UTC (rev 59515)
+++ trunk/blender/source/blender/editors/datafiles/CMakeLists.txt	2013-08-26 12:16:23 UTC (rev 59516)
@@ -47,17 +47,18 @@
 
 		# images
 		data_to_c_simple(../../../../release/datafiles/splash.png SRC)
-		svg_to_png(../../../../release/datafiles/blender_icons.svg
-		           ../../../../release/datafiles/blender_icons16.png
-		           90 SRC)
+		# XXX These are handy, but give nasty "false changes" in svn :/
+		#svg_to_png(../../../../release/datafiles/blender_icons.svg
+		           #../../../../release/datafiles/blender_icons16.png
+		           #90 SRC)
 		data_to_c_simple(../../../../release/datafiles/blender_icons16.png SRC)
-		svg_to_png(../../../../release/datafiles/blender_icons.svg
-		           ../../../../release/datafiles/blender_icons32.png
-		           180 SRC)
+		#svg_to_png(../../../../release/datafiles/blender_icons.svg
+		           #../../../../release/datafiles/blender_icons32.png
+		           #180 SRC)
 		data_to_c_simple(../../../../release/datafiles/blender_icons32.png SRC)
-		svg_to_png(../../../../release/datafiles/prvicons.svg
-		           ../../../../release/datafiles/prvicons.png
-		           90 SRC)
+		#svg_to_png(../../../../release/datafiles/prvicons.svg
+		           #../../../../release/datafiles/prvicons.png
+		           #90 SRC)
 		data_to_c_simple(../../../../release/datafiles/prvicons.png SRC)
 
 		# brushes




More information about the Bf-blender-cvs mailing list