Revision: 35417
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35417
Author: campbellbarton
Date: 2011-03-09 01:25:59 +0000 (Wed, 09 Mar 2011)
Log Message:
-----------
image.depth, 96/128 for float color images, was 24/32 for byte images.
also use <> for system includes
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
trunk/blender/source/blender/modifiers/intern/MOD_smoke.c
trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
Modified: trunk/blender/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2011-03-09
01:13:28 UTC (rev 35416)
+++ trunk/blender/intern/guardedalloc/MEM_guardedalloc.h 2011-03-09
01:25:59 UTC (rev 35417)
@@ -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
Modified: trunk/blender/source/blender/makesrna/intern/rna_image.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_image.c 2011-03-09
01:13:28 UTC (rev 35416)
+++ trunk/blender/source/blender/makesrna/intern/rna_image.c 2011-03-09
01:25:59 UTC (rev 35417)
@@ -234,7 +234,7 @@
if(!ibuf)
depth= 0;
else if(ibuf->rect_float)
- depth= 128;
+ depth= ibuf->depth * 4;
else
depth= ibuf->depth;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
2011-03-09 01:13:28 UTC (rev 35416)
+++ trunk/blender/source/blender/modifiers/intern/MOD_particlesystem.c
2011-03-09 01:25:59 UTC (rev 35417)
@@ -35,7 +35,7 @@
*/
-#include "stddef.h"
+#include <stddef.h>
#include "DNA_material_types.h"
Modified: trunk/blender/source/blender/modifiers/intern/MOD_smoke.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_smoke.c 2011-03-09
01:13:28 UTC (rev 35416)
+++ trunk/blender/source/blender/modifiers/intern/MOD_smoke.c 2011-03-09
01:25:59 UTC (rev 35417)
@@ -35,7 +35,7 @@
*/
-#include "stddef.h"
+#include <stddef.h>
#include "MEM_guardedalloc.h"
Modified: trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c 2011-03-09
01:13:28 UTC (rev 35416)
+++ trunk/blender/source/blender/modifiers/intern/MOD_subsurf.c 2011-03-09
01:25:59 UTC (rev 35417)
@@ -35,7 +35,7 @@
*/
-#include "stddef.h"
+#include <stddef.h>
#include "DNA_scene_types.h"
#include "DNA_object_types.h"
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
2011-03-09 01:13:28 UTC (rev 35416)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
2011-03-09 01:25:59 UTC (rev 35417)
@@ -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) :
Modified: trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
2011-03-09 01:13:28 UTC (rev 35416)
+++ trunk/blender/source/gameengine/Expressions/PyObjectPlus.cpp
2011-03-09 01:25:59 UTC (rev 35417)
@@ -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"
Modified: trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp 2011-03-09
01:13:28 UTC (rev 35416)
+++ trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp 2011-03-09
01:25:59 UTC (rev 35417)
@@ -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"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
