Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-11-22 00:47:19 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-22 00:47:19 +0400
commit30fd1ab523393216a66a7debb7e42ec39e40a242 (patch)
treea3ce9ca35b4f177f0dd31e62691a4613b242aaae /source/blender/makesrna/intern/rna_image.c
parent02a164baaa57ab037419fde864e02d6a432e858d (diff)
replace ImBuf.depth with ImBuf.planes to match ImageFormatData.planes & to avoid confusion with ImageFormatData.depth
Diffstat (limited to 'source/blender/makesrna/intern/rna_image.c')
-rw-r--r--source/blender/makesrna/intern/rna_image.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index ad6f459f851..737ce73ff1d 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -258,20 +258,20 @@ static int rna_Image_depth_get(PointerRNA *ptr)
Image *im= (Image*)ptr->data;
ImBuf *ibuf;
void *lock;
- int depth;
+ int planes;
ibuf= BKE_image_acquire_ibuf(im, NULL, &lock);
if(!ibuf)
- depth= 0;
+ planes= 0;
else if(ibuf->rect_float)
- depth= ibuf->depth * 4;
+ planes= ibuf->planes * 4;
else
- depth= ibuf->depth;
+ planes= ibuf->planes;
BKE_image_release_ibuf(im, lock);
- return depth;
+ return planes;
}
static int rna_Image_pixels_get_length(PointerRNA *ptr, int length[RNA_MAX_ARRAY_DIMENSION])