image.depth, 96/128 for float color images, was 24/32 for byte images.
authorCampbell Barton <ideasman42@gmail.com>
Wed, 9 Mar 2011 01:25:59 +0000 (01:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 9 Mar 2011 01:25:59 +0000 (01:25 +0000)
also use <> for system includes

intern/guardedalloc/MEM_guardedalloc.h
source/blender/makesrna/intern/rna_image.c
source/blender/modifiers/intern/MOD_particlesystem.c
source/blender/modifiers/intern/MOD_smoke.c
source/blender/modifiers/intern/MOD_subsurf.c
source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
source/gameengine/Expressions/PyObjectPlus.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp

index fcf4b48865912d51d6f0c7d58655ca311a6b5150..f96a49b9f4afad63e3286277c8e1f2537c37928d 100644 (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
index 6fa0e2bae82466823b1eb57976f182d647c755a7..64b7e589ecb203438ee5a46757ba0368740ea2e9 100644 (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;
 
index 1a6cbc4781f15cc6c5b31e0f470f7d70d6f49998..7e94a76598b8ec6359192b7a9708ea98820a195d 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 
-#include "stddef.h"
+#include <stddef.h>
 
 #include "DNA_material_types.h"
 
index 351a86624bea1bf4de9eb3956beddb6397b5a858..b13d86a609e1035d389c9409b5e7c6065451adb5 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 
-#include "stddef.h"
+#include <stddef.h>
 
 #include "MEM_guardedalloc.h"
 
index 0d0e81925f73873dcf6223e97d8fdbbfbf4a49fd..fc9958b08d045ba57cc5a670b76bbbf547fb9aa3 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 
-#include "stddef.h"
+#include <stddef.h>
 
 #include "DNA_scene_types.h"
 #include "DNA_object_types.h"
index 9dd63fa30891b09ab71d4db1463f57116b869d49..ded72b45b81e15739be7b601ed7decdb60e0ccce 100644 (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) :
index e205ddfda2e444dfa0b84c35cb237bb447d040bd..d81b6fc03bea36e62cd78801ebd3e9a4d37bc53c 100644 (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"
index 88e178dda19ea9b4c74ff4cc7cd8ae336419594e..1b35219a36dcfaa2ec3e9a306bff53d9922bb5f2 100644 (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"