image.depth, 96/128 for float color images, was 24/32 for byte images.

also use <> for system includes
This commit is contained in:
Campbell Barton
2011-03-09 01:25:59 +00:00
parent 3f9bbde4a6
commit 53139432dd
8 changed files with 8 additions and 8 deletions

View File

@@ -61,7 +61,7 @@
#ifndef MEM_MALLOCN_H
#define MEM_MALLOCN_H
#include "stdio.h" /* needed for FILE* */
#include <stdio.h> /* needed for FILE* */
#include "MEM_sys_types.h" /* needed for uintptr_t */
#ifndef WARN_UNUSED

View File

@@ -234,7 +234,7 @@ static int rna_Image_depth_get(PointerRNA *ptr)
if(!ibuf)
depth= 0;
else if(ibuf->rect_float)
depth= 128;
depth= ibuf->depth * 4;
else
depth= ibuf->depth;

View File

@@ -35,7 +35,7 @@
*/
#include "stddef.h"
#include <stddef.h>
#include "DNA_material_types.h"

View File

@@ -35,7 +35,7 @@
*/
#include "stddef.h"
#include <stddef.h>
#include "MEM_guardedalloc.h"

View File

@@ -35,7 +35,7 @@
*/
#include "stddef.h"
#include <stddef.h>
#include "DNA_scene_types.h"
#include "DNA_object_types.h"

View File

@@ -33,7 +33,7 @@
#include "KX_BlenderCanvas.h"
#include "DNA_screen_types.h"
#include "stdio.h"
#include <stdio.h>
KX_BlenderCanvas::KX_BlenderCanvas(struct wmWindow *win, RAS_Rect &rect, struct ARegion *ar) :

View File

@@ -46,7 +46,7 @@
*
------------------------------*/
#include <MT_assert.h>
#include "stdlib.h"
#include <stdlib.h>
#include "PyObjectPlus.h"
#include "STR_String.h"
#include "MT_Vector3.h"

View File

@@ -38,6 +38,7 @@
#endif //WIN32
#include <iostream>
#include <stdio.h>
#include "KX_KetsjiEngine.h"
@@ -77,7 +78,6 @@
#include "KX_TimeCategoryLogger.h"
#include "RAS_FramingManager.h"
#include "stdio.h"
#include "DNA_world_types.h"
#include "DNA_scene_types.h"