diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-03-09 04:25:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-09 04:25:59 +0300 |
commit | 53139432dd5dd308c44cb3c536f24913afa7ccb2 (patch) | |
tree | d0d6c8f5311147a11613a3448aca28a784905d65 /source | |
parent | 3f9bbde4a6668b19a7a7f291dc2305e6341d5b5d (diff) |
image.depth, 96/128 for float color images, was 24/32 for byte images.
also use <> for system includes
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_image.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_particlesystem.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_smoke.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_subsurf.c | 2 | ||||
-rw-r--r-- | source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Expressions/PyObjectPlus.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_KetsjiEngine.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 6fa0e2bae82..64b7e589ecb 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -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; diff --git a/source/blender/modifiers/intern/MOD_particlesystem.c b/source/blender/modifiers/intern/MOD_particlesystem.c index 1a6cbc4781f..7e94a76598b 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.c +++ b/source/blender/modifiers/intern/MOD_particlesystem.c @@ -35,7 +35,7 @@ */ -#include "stddef.h" +#include <stddef.h> #include "DNA_material_types.h" diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index 351a86624be..b13d86a609e 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -35,7 +35,7 @@ */ -#include "stddef.h" +#include <stddef.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index 0d0e81925f7..fc9958b08d0 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -35,7 +35,7 @@ */ -#include "stddef.h" +#include <stddef.h> #include "DNA_scene_types.h" #include "DNA_object_types.h" diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp index 9dd63fa3089..ded72b45b81 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp @@ -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) : diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp index e205ddfda2e..d81b6fc03be 100644 --- a/source/gameengine/Expressions/PyObjectPlus.cpp +++ b/source/gameengine/Expressions/PyObjectPlus.cpp @@ -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" diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index 88e178dda19..1b35219a36d 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -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" |