[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49809] trunk/blender: generate brush icons C files at build time.
Campbell Barton
ideasman42 at gmail.com
Sat Aug 11 16:40:10 CEST 2012
Revision: 49809
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49809
Author: campbellbarton
Date: 2012-08-11 14:40:09 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
generate brush icons C files at build time.
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
trunk/blender/source/blender/editors/datafiles/SConscript
trunk/blender/source/blender/editors/include/ED_datafiles.h
trunk/blender/source/blender/editors/space_file/filelist.c
Added Paths:
-----------
trunk/blender/release/datafiles/prvicons.png
Removed Paths:
-------------
trunk/blender/release/datafiles/prvicons
trunk/blender/source/blender/editors/datafiles/add.png.c
trunk/blender/source/blender/editors/datafiles/blob.png.c
trunk/blender/source/blender/editors/datafiles/blur.png.c
trunk/blender/source/blender/editors/datafiles/clay.png.c
trunk/blender/source/blender/editors/datafiles/claystrips.png.c
trunk/blender/source/blender/editors/datafiles/clone.png.c
trunk/blender/source/blender/editors/datafiles/crease.png.c
trunk/blender/source/blender/editors/datafiles/darken.png.c
trunk/blender/source/blender/editors/datafiles/draw.png.c
trunk/blender/source/blender/editors/datafiles/fill.png.c
trunk/blender/source/blender/editors/datafiles/flatten.png.c
trunk/blender/source/blender/editors/datafiles/grab.png.c
trunk/blender/source/blender/editors/datafiles/inflate.png.c
trunk/blender/source/blender/editors/datafiles/layer.png.c
trunk/blender/source/blender/editors/datafiles/lighten.png.c
trunk/blender/source/blender/editors/datafiles/mask.png.c
trunk/blender/source/blender/editors/datafiles/mix.png.c
trunk/blender/source/blender/editors/datafiles/multiply.png.c
trunk/blender/source/blender/editors/datafiles/nudge.png.c
trunk/blender/source/blender/editors/datafiles/pinch.png.c
trunk/blender/source/blender/editors/datafiles/prvicons.c
trunk/blender/source/blender/editors/datafiles/scrape.png.c
trunk/blender/source/blender/editors/datafiles/smear.png.c
trunk/blender/source/blender/editors/datafiles/smooth.png.c
trunk/blender/source/blender/editors/datafiles/snake_hook.png.c
trunk/blender/source/blender/editors/datafiles/soften.png.c
trunk/blender/source/blender/editors/datafiles/subtract.png.c
trunk/blender/source/blender/editors/datafiles/texdraw.png.c
trunk/blender/source/blender/editors/datafiles/thumb.png.c
trunk/blender/source/blender/editors/datafiles/twist.png.c
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2012-08-11 14:39:09 UTC (rev 49808)
+++ trunk/blender/SConstruct 2012-08-11 14:40:09 UTC (rev 49809)
@@ -455,7 +455,7 @@
# use for includes
env['DATA_HEADERS'] = os.path.join(os.path.abspath(env['BF_BUILDDIR']), "data_headers")
env['DATA_SOURCES'] = os.path.join(os.path.abspath(env['BF_BUILDDIR']), "data_sources")
-def ensure_data(FILE_FROM, FILE_TO, VAR_NAME):
+def data_to_c(FILE_FROM, FILE_TO, VAR_NAME):
if os.sep == "\\":
FILE_FROM = FILE_FROM.replace("/", "\\")
FILE_TO = FILE_TO.replace("/", "\\")
@@ -486,42 +486,62 @@
fpin.close()
fpout.close()
-ensure_data("source/blender/compositor/operations/COM_OpenCLKernels.cl",
- B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
- "clkernelstoh_COM_OpenCLKernels_cl")
+def data_to_c_simple(FILE_FROM):
+ filename_only = os.path.basename(FILE_FROM)
+ FILE_TO = os.path.join(env['DATA_SOURCES'], filename_only + ".c")
+ VAR_NAME = "datatoc_" + filename_only.replace(".", "_")
+
+ data_to_c(FILE_FROM, FILE_TO, VAR_NAME)
+
-ensure_data("./release/datafiles/startup.blend",
- B.root_build_dir + "data_sources/startup.blend.c",
- "datatoc_startup_blend")
+data_to_c("source/blender/compositor/operations/COM_OpenCLKernels.cl",
+ B.root_build_dir + "data_headers/COM_OpenCLKernels.cl.h",
+ "clkernelstoh_COM_OpenCLKernels_cl")
-ensure_data("./release/datafiles/preview.blend",
- B.root_build_dir + "data_sources/preview.blend.c",
- "datatoc_preview_blend")
+data_to_c_simple("release/datafiles/startup.blend")
+data_to_c_simple("release/datafiles/preview.blend")
# --- glsl ---
-ensure_data("source/blender/gpu/shaders/gpu_shader_material.glsl",
- B.root_build_dir + "data_sources/gpu_shader_material.glsl.c",
- "datatoc_gpu_shader_material_glsl")
-ensure_data("source/blender/gpu/shaders/gpu_shader_vertex.glsl",
- B.root_build_dir + "data_sources/gpu_shader_vertex.glsl.c",
- "datatoc_gpu_shader_vertex_glsl")
-ensure_data("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl",
- B.root_build_dir + "data_sources/gpu_shader_sep_gaussian_blur_frag.glsl.c",
- "datatoc_gpu_shader_sep_gaussian_blur_frag_glsl")
-ensure_data("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl",
- B.root_build_dir + "data_sources/gpu_shader_sep_gaussian_blur_vert.glsl.c",
- "datatoc_gpu_shader_sep_gaussian_blur_vert_glsl")
-ensure_data("source/blender/gpu/shaders/gpu_shader_material.glsl",
- B.root_build_dir + "data_sources/gpu_shader_material.glsl.c",
- "datatoc_gpu_shader_material_glsl")
-ensure_data("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl",
- B.root_build_dir + "data_sources/gpu_shader_vsm_store_frag.glsl.c",
- "datatoc_gpu_shader_vsm_store_frag_glsl")
-ensure_data("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl",
- B.root_build_dir + "data_sources/gpu_shader_vsm_store_vert.glsl.c",
- "datatoc_gpu_shader_vsm_store_vert_glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
+data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
+data_to_c_simple("release/datafiles/brushicons/add.png")
+data_to_c_simple("release/datafiles/brushicons/blob.png")
+data_to_c_simple("release/datafiles/brushicons/blur.png")
+data_to_c_simple("release/datafiles/brushicons/clay.png")
+data_to_c_simple("release/datafiles/brushicons/claystrips.png")
+data_to_c_simple("release/datafiles/brushicons/clone.png")
+data_to_c_simple("release/datafiles/brushicons/crease.png")
+data_to_c_simple("release/datafiles/brushicons/darken.png")
+data_to_c_simple("release/datafiles/brushicons/draw.png")
+data_to_c_simple("release/datafiles/brushicons/fill.png")
+data_to_c_simple("release/datafiles/brushicons/flatten.png")
+data_to_c_simple("release/datafiles/brushicons/grab.png")
+data_to_c_simple("release/datafiles/brushicons/inflate.png")
+data_to_c_simple("release/datafiles/brushicons/layer.png")
+data_to_c_simple("release/datafiles/brushicons/lighten.png")
+data_to_c_simple("release/datafiles/brushicons/mask.png")
+data_to_c_simple("release/datafiles/brushicons/mix.png")
+data_to_c_simple("release/datafiles/brushicons/multiply.png")
+data_to_c_simple("release/datafiles/brushicons/nudge.png")
+data_to_c_simple("release/datafiles/brushicons/pinch.png")
+data_to_c_simple("release/datafiles/brushicons/scrape.png")
+data_to_c_simple("release/datafiles/brushicons/smear.png")
+data_to_c_simple("release/datafiles/brushicons/smooth.png")
+data_to_c_simple("release/datafiles/brushicons/snake_hook.png")
+data_to_c_simple("release/datafiles/brushicons/soften.png")
+data_to_c_simple("release/datafiles/brushicons/subtract.png")
+data_to_c_simple("release/datafiles/brushicons/texdraw.png")
+data_to_c_simple("release/datafiles/brushicons/thumb.png")
+data_to_c_simple("release/datafiles/brushicons/twist.png")
+data_to_c_simple("release/datafiles/brushicons/vertexdraw.png")
+data_to_c_simple("release/datafiles/prvicons.png")
##### END DATAFILES ##########
Deleted: trunk/blender/release/datafiles/prvicons
===================================================================
(Binary files differ)
Copied: trunk/blender/release/datafiles/prvicons.png (from rev 49798, trunk/blender/release/datafiles/prvicons)
===================================================================
(Binary files differ)
Modified: trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/datafiles/CMakeLists.txt 2012-08-11 14:39:09 UTC (rev 49808)
+++ trunk/blender/source/blender/editors/datafiles/CMakeLists.txt 2012-08-11 14:40:09 UTC (rev 49809)
@@ -45,41 +45,42 @@
# images
splash.png.c
blender_icons.png.c
-
- # brushes
- add.png.c
- blob.png.c
- blur.png.c
- clay.png.c
- clone.png.c
- crease.png.c
- darken.png.c
- draw.png.c
- fill.png.c
- flatten.png.c
- grab.png.c
- inflate.png.c
- layer.png.c
- lighten.png.c
- mask.png.c
- mix.png.c
- multiply.png.c
- nudge.png.c
- pinch.png.c
- prvicons.c
- scrape.png.c
- smear.png.c
- smooth.png.c
- snake_hook.png.c
- soften.png.c
- claystrips.png.c
- subtract.png.c
- texdraw.png.c
- thumb.png.c
- twist.png.c
- vertexdraw.png.c
)
+ # brushes
+ data_to_c_simple(../../../../release/datafiles/brushicons/add.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/blob.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/blur.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/clay.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/claystrips.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/clone.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/crease.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/darken.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/draw.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/fill.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/flatten.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/grab.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/inflate.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/layer.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/lighten.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/mask.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/mix.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/multiply.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/nudge.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/pinch.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/scrape.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/smear.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/smooth.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/snake_hook.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/soften.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/subtract.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/texdraw.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/thumb.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/twist.png SRC)
+ data_to_c_simple(../../../../release/datafiles/brushicons/vertexdraw.png SRC)
+
+ data_to_c_simple(../../../../release/datafiles/prvicons.png SRC)
+
data_to_c_simple(../../../../release/datafiles/preview.blend SRC)
endif()
Modified: trunk/blender/source/blender/editors/datafiles/SConscript
===================================================================
--- trunk/blender/source/blender/editors/datafiles/SConscript 2012-08-11 14:39:09 UTC (rev 49808)
+++ trunk/blender/source/blender/editors/datafiles/SConscript 2012-08-11 14:40:09 UTC (rev 49809)
@@ -11,6 +11,39 @@
sources.extend((
os.path.join(env['DATA_SOURCES'], "startup.blend.c"),
os.path.join(env['DATA_SOURCES'], "preview.blend.c"),
+
+ os.path.join(env['DATA_SOURCES'], "add.png.c"),
+ os.path.join(env['DATA_SOURCES'], "blob.png.c"),
+ os.path.join(env['DATA_SOURCES'], "blur.png.c"),
+ os.path.join(env['DATA_SOURCES'], "clay.png.c"),
+ os.path.join(env['DATA_SOURCES'], "claystrips.png.c"),
+ os.path.join(env['DATA_SOURCES'], "clone.png.c"),
+ os.path.join(env['DATA_SOURCES'], "crease.png.c"),
+ os.path.join(env['DATA_SOURCES'], "darken.png.c"),
+ os.path.join(env['DATA_SOURCES'], "draw.png.c"),
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list