Revision: 42044
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42044
Author: campbellbarton
Date: 2011-11-21 20:47:19 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
replace ImBuf.depth with ImBuf.planes to match ImageFormatData.planes & to
avoid confusion with ImageFormatData.depth
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/properties_render.py
trunk/blender/source/blender/blenkernel/intern/bmfont.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/imbuf/IMB_imbuf_types.h
trunk/blender/source/blender/imbuf/intern/IMB_filter.h
trunk/blender/source/blender/imbuf/intern/allocimbuf.c
trunk/blender/source/blender/imbuf/intern/filter.c
trunk/blender/source/blender/imbuf/intern/imbuf_cocoa.m
trunk/blender/source/blender/imbuf/intern/iris.c
trunk/blender/source/blender/imbuf/intern/jp2.c
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
trunk/blender/source/blender/imbuf/intern/png.c
trunk/blender/source/blender/imbuf/intern/scaling.c
trunk/blender/source/blender/imbuf/intern/targa.c
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/imbuf/intern/tiff.c
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/makesrna/intern/rna_image_api.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/rendercore.c
trunk/blender/source/creator/creator.c
trunk/blender/source/gameengine/GamePlayer/common/bmfont.cpp
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_render.py
2011-11-21 20:43:25 UTC (rev 42043)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_render.py
2011-11-21 20:47:19 UTC (rev 42044)
@@ -467,53 +467,6 @@
col.prop(rd, "use_overwrite")
col.prop(rd, "use_placeholder")
- """
- if file_format in {'AVI_JPEG', 'JPEG'}:
- layout.prop(rd, "file_quality", slider=True)
-
- if file_format == 'PNG':
- layout.prop(rd, "file_quality", slider=True, text="Compression")
-
- if file_format in {'OPEN_EXR', 'MULTILAYER'}:
- row = layout.row()
- row.prop(rd, "exr_codec", text="Codec")
-
- if file_format == 'OPEN_EXR':
- row = layout.row()
- row.prop(rd, "use_exr_half")
- row.prop(rd, "exr_zbuf")
- row.prop(rd, "exr_preview")
-
- elif file_format == 'JPEG2000':
- split = layout.split()
- col = split.column()
- col.label(text="Depth:")
- col.row().prop(rd, "jpeg2k_depth", expand=True)
-
- col = split.column()
- col.prop(rd, "jpeg2k_preset", text="")
- col.prop(rd, "jpeg2k_ycc")
-
- elif file_format in {'CINEON', 'DPX'}:
-
- split = layout.split()
- split.label("FIXME: hard coded Non-Linear, Gamma:1.0")
- '''
- col = split.column()
- col.prop(rd, "use_cineon_log", text="Convert to Log")
-
- col = split.column(align=True)
- col.active = rd.use_cineon_log
- col.prop(rd, "cineon_black", text="Black")
- col.prop(rd, "cineon_white", text="White")
- col.prop(rd, "cineon_gamma", text="Gamma")
- '''
-
- elif file_format == 'TIFF':
- layout.prop(rd, "use_tiff_16bit")
-
- elif """
-
if file_format == 'QUICKTIME_CARBON':
layout.operator("scene.render_data_set_quicktime_codec")
Modified: trunk/blender/source/blender/blenkernel/intern/bmfont.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bmfont.c 2011-11-21
20:43:25 UTC (rev 42043)
+++ trunk/blender/source/blender/blenkernel/intern/bmfont.c 2011-11-21
20:47:19 UTC (rev 42044)
@@ -159,7 +159,7 @@
ibuf->userdata = bmfont;
ibuf->userflags |= IB_BITMAPFONT;
- if (ibuf->depth < 32) {
+ if (ibuf->planes < 32) {
// we're going to fake alpha here:
calcAlpha(ibuf);
}
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2011-11-21
20:43:25 UTC (rev 42043)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2011-11-21
20:47:19 UTC (rev 42044)
@@ -601,7 +601,7 @@
}
ibuf->ftype= PNG;
- ibuf->depth= 32;
+ ibuf->planes= R_IMF_PLANES_RGBA;
IMB_saveiff(ibuf, ibuf->name, IB_rect | IB_mem);
if(ibuf->encodedbuffer==NULL) {
@@ -1535,7 +1535,7 @@
/* R_JPEG90, etc. default we save jpegs */
if(quality < 10) quality= 90;
ibuf->ftype= JPG|quality;
- if(ibuf->depth==32) ibuf->depth= 24; /* unsupported feature
only confuses other s/w */
+ if(ibuf->planes==32) ibuf->planes= 24; /* unsupported feature
only confuses other s/w */
}
BLI_make_existing_file(name);
@@ -2487,13 +2487,13 @@
{
ImBuf *ibuf;
void *lock;
- int depth;
+ int planes;
ibuf= BKE_image_acquire_ibuf(image, NULL, &lock);
- depth = (ibuf?ibuf->depth:0);
+ planes = (ibuf?ibuf->planes:0);
BKE_image_release_ibuf(image, lock);
- if (depth == 32)
+ if (planes == 32)
return 1;
else
return 0;
Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c 2011-11-21
20:43:25 UTC (rev 42043)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c 2011-11-21
20:47:19 UTC (rev 42044)
@@ -913,8 +913,8 @@
scaleibuf->ftype= JPG | quality;
/* unsupported feature only confuses other s/w */
- if(scaleibuf->depth==32)
- scaleibuf->depth= 24;
+ if(scaleibuf->planes==32)
+ scaleibuf->planes= 24;
BLI_lock_thread(LOCK_MOVIECLIP);
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2011-11-21
20:43:25 UTC (rev 42043)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2011-11-21
20:47:19 UTC (rev 42044)
@@ -348,7 +348,7 @@
sce->r.filtertype= R_FILTER_MITCH;
sce->r.size= 50;
- sce->r.im_format.planes= R_PLANES24;
+ sce->r.im_format.planes= R_IMF_PLANES_RGB;
sce->r.im_format.imtype= R_PNG;
sce->r.im_format.quality= 90;
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2011-11-21
20:43:25 UTC (rev 42043)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2011-11-21
20:47:19 UTC (rev 42044)
@@ -1327,8 +1327,8 @@
ibuf->ftype= JPG | quality;
/* unsupported feature only confuses other s/w */
- if(ibuf->depth==32)
- ibuf->depth= 24;
+ if(ibuf->planes==32)
+ ibuf->planes= 24;
BLI_make_existing_file(name);
@@ -1729,7 +1729,7 @@
}
if(seq->flag & SEQ_MAKE_PREMUL) {
- if(ibuf->depth == 32 && ibuf->zbuf == NULL) {
+ if(ibuf->planes == 32 && ibuf->zbuf == NULL) {
IMB_premultiply_alpha(ibuf);
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2011-11-21
20:43:25 UTC (rev 42043)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2011-11-21
20:47:19 UTC (rev 42044)
@@ -2022,7 +2022,7 @@
}
}
else {
- cacheibuf= IMB_allocImBuf(srcibuf->x, srcibuf->y,
srcibuf->depth, flags);
+ cacheibuf= IMB_allocImBuf(srcibuf->x, srcibuf->y,
srcibuf->planes, flags);
cacheibuf->profile= srcibuf->profile;
}
Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c 2011-11-21
20:43:25 UTC (rev 42043)
+++ trunk/blender/source/blender/editors/object/object_bake.c 2011-11-21
20:47:19 UTC (rev 42044)
@@ -1039,7 +1039,7 @@
if((ima->id.flag&LIB_DOIT)==0) {
ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
- IMB_rectfill(ibuf, (ibuf->depth == 32) ? vec_alpha :
vec_solid);
+ IMB_rectfill(ibuf, (ibuf->planes == R_IMF_PLANES_RGBA)
? vec_alpha : vec_solid);
ima->id.flag|= LIB_DOIT;
}
}
Modified: trunk/blender/source/blender/editors/render/render_opengl.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_opengl.c 2011-11-21
20:43:25 UTC (rev 42043)
+++ trunk/blender/source/blender/editors/render/render_opengl.c 2011-11-21
20:47:19 UTC (rev 42044)
@@ -440,7 +440,7 @@
if(ibuf) {
/* color -> greyscale */
/* editing directly would alter the render view */
- if(scene->r.im_format.planes == R_PLANESBW) {
+ if(scene->r.im_format.planes == R_IMF_PLANES_BW) {
ImBuf *ibuf_bw= IMB_dupImBuf(ibuf);
IMB_color_to_bw(ibuf_bw);
// IMB_freeImBuf(ibuf); /* owned by the image */
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2011-11-21 20:43:25 UTC (rev 42043)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2011-11-21 20:47:19 UTC (rev 42044)
@@ -4333,7 +4333,7 @@
/* note: allocImbuf returns zero'd memory, so regions outside image will
have zero alpha, and hence not be blended onto the image */
int w=ibufb->x, h=ibufb->y, destx=0, desty=0, srcx=pos[0], srcy=pos[1];
- ImBuf *clonebuf= IMB_allocImBuf(w, h, ibufb->depth, ibufb->flags);
+ ImBuf *clonebuf= IMB_allocImBuf(w, h, ibufb->planes, ibufb->flags);
IMB_rectclip(clonebuf, ibuf, &destx, &desty, &srcx, &srcy, &w, &h);
IMB_rectblend(clonebuf, ibuf, destx, desty, srcx, srcy, w, h,
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_buttons.c
2011-11-21 20:43:25 UTC (rev 42043)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c
2011-11-21 20:47:19 UTC (rev 42044)
@@ -122,13 +122,13 @@
if(ibuf->channels!=4) {
ofs+= sprintf(str+ofs, "%d float channel(s)",
ibuf->channels);
}
- else if(ibuf->depth==32)
+ else if(ibuf->planes == R_IMF_PLANES_RGBA)
ofs+= sprintf(str+ofs, " RGBA float");
else
ofs+= sprintf(str+ofs, " RGB float");
}
else {
- if(ibuf->depth==32)
+ if(ibuf->planes == R_IMF_PLANES_RGBA)
ofs+= sprintf(str+ofs, " RGBA byte");
else
ofs+= sprintf(str+ofs, " RGB byte");
Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c
2011-11-21 20:43:25 UTC (rev 42043)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c
2011-11-21 20:47:19 UTC (rev 42044)
@@ -949,7 +949,7 @@
static void save_image_options_defaults(SaveImageOptions *simopts)
{
- simopts->planes= R_PLANES24;
+ simopts->planes= R_IMF_PLANES_RGB;
simopts->imtype= R_PNG;
simopts->subimtype= 0;
simopts->quality= 90;
@@ -964,7 +964,7 @@
if(ibuf) {
Image *ima= sima->image;
- simopts->planes= ibuf->depth;
+ simopts->planes= ibuf->planes;
if(ELEM(ima->type, IMA_TYPE_R_RESULT, IMA_TYPE_COMPOSITE)) {
simopts->imtype= scene->r.im_format.imtype;
@@ -984,8 +984,8 @@
/* sanitize all settings */
/* unlikely but just incase */
- if (ELEM3(simopts->planes, R_PLANESBW, R_PLANES24, R_PLANES32)
== 0) {
- simopts->planes= R_PLANES32;
+ if (ELEM3(simopts->planes, R_IMF_PLANES_BW, R_IMF_PLANES_RGB,
R_IMF_PLANES_RGBA) == 0) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
