Revision: 28650
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28650
Author: blendix
Date: 2010-05-07 17:08:45 +0200 (Fri, 07 May 2010)
Log Message:
-----------
Render Branch: small fixes and tweaks:
* better multires error message
* sync blenpluginapi/iff.h with imbuf changes
* remove some unused includes
Modified Paths:
--------------
branches/render25/source/blender/blenkernel/intern/customdata.c
branches/render25/source/blender/blenloader/intern/writefile.c
branches/render25/source/blender/blenpluginapi/iff.h
branches/render25/source/blender/imbuf/IMB_imbuf_types.h
branches/render25/source/blender/makesrna/intern/rna_ID.c
branches/render25/source/blender/makesrna/intern/rna_access.c
branches/render25/source/blender/makesrna/intern/rna_action_api.c
branches/render25/source/blender/makesrna/intern/rna_actuator.c
branches/render25/source/blender/makesrna/intern/rna_animation.c
branches/render25/source/blender/windowmanager/intern/wm_jobs.c
Modified: branches/render25/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/customdata.c
2010-05-07 12:01:32 UTC (rev 28649)
+++ branches/render25/source/blender/blenkernel/intern/customdata.c
2010-05-07 15:08:45 UTC (rev 28650)
@@ -559,7 +559,7 @@
d[i].disps = MEM_callocN(sizeof(float)*3*d[i].totdisp,
"mdisps read");
if(!cdf_read_data(cdf, d[i].totdisp*3*sizeof(float),
d[i].disps)) {
- printf("failed to read %d/%d %d\n", i, count,
d[i].totdisp);
+ printf("failed to read multires displacement %d/%d
%d\n", i, count, d[i].totdisp);
return 0;
}
}
@@ -574,7 +574,7 @@
for(i = 0; i < count; ++i) {
if(!cdf_write_data(cdf, d[i].totdisp*3*sizeof(float),
d[i].disps)) {
- printf("failed to write %d/%d %d\n", i, count,
d[i].totdisp);
+ printf("failed to write multires displacement %d/%d
%d\n", i, count, d[i].totdisp);
return 0;
}
}
Modified: branches/render25/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/render25/source/blender/blenloader/intern/writefile.c
2010-05-07 12:01:32 UTC (rev 28649)
+++ branches/render25/source/blender/blenloader/intern/writefile.c
2010-05-07 15:08:45 UTC (rev 28650)
@@ -1233,8 +1233,6 @@
writestruct(wd, DATA, "MDefInfluence",
mmd->totinfluence, mmd->bindinfluences);
writedata(wd, DATA, sizeof(int)*(mmd->totvert+1),
mmd->bindoffsets);
- writestruct(wd, DATA, "MDefInfluence",
mmd->totinfluence, mmd->bindinfluences);
- writedata(wd, DATA, sizeof(int)*(mmd->totvert+1),
mmd->bindoffsets);
writedata(wd, DATA, sizeof(float)*3*mmd->totcagevert,
mmd->bindcagecos);
writestruct(wd, DATA, "MDefCell", size*size*size,
mmd->dyngrid);
Modified: branches/render25/source/blender/blenpluginapi/iff.h
===================================================================
--- branches/render25/source/blender/blenpluginapi/iff.h 2010-05-07
12:01:32 UTC (rev 28649)
+++ branches/render25/source/blender/blenpluginapi/iff.h 2010-05-07
15:08:45 UTC (rev 28650)
@@ -87,7 +87,6 @@
LIBIMPORT short saveiff(struct ImBuf *,char *,int);
-LIBIMPORT struct ImBuf *loadiffmem(int *,int);
LIBIMPORT struct ImBuf *loadifffile(int,int);
LIBIMPORT struct ImBuf *loadiffname(char *,int);
LIBIMPORT struct ImBuf *testiffname(char *,int);
Modified: branches/render25/source/blender/imbuf/IMB_imbuf_types.h
===================================================================
--- branches/render25/source/blender/imbuf/IMB_imbuf_types.h 2010-05-07
12:01:32 UTC (rev 28649)
+++ branches/render25/source/blender/imbuf/IMB_imbuf_types.h 2010-05-07
15:08:45 UTC (rev 28650)
@@ -207,18 +207,14 @@
#define IMAGIC 0732
-/*...@}*/
-
/**
* \name Imbuf preset profile tags
* \brief Some predefined color space profiles that 8 bit imbufs can represent
*/
-/*...@{*/
#define IB_PROFILE_NONE 0
#define IB_PROFILE_LINEAR_RGB 1
#define IB_PROFILE_SRGB 2
#define IB_PROFILE_CUSTOM 3
-/*...@}*/
#endif
Modified: branches/render25/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_ID.c 2010-05-07
12:01:32 UTC (rev 28649)
+++ branches/render25/source/blender/makesrna/intern/rna_ID.c 2010-05-07
15:08:45 UTC (rev 28650)
@@ -27,7 +27,6 @@
#include "RNA_access.h"
#include "RNA_define.h"
-#include "RNA_types.h"
#include "DNA_ID.h"
Modified: branches/render25/source/blender/makesrna/intern/rna_access.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_access.c
2010-05-07 12:01:32 UTC (rev 28649)
+++ branches/render25/source/blender/makesrna/intern/rna_access.c
2010-05-07 15:08:45 UTC (rev 28650)
@@ -47,7 +47,6 @@
#include "RNA_access.h"
#include "RNA_define.h"
-#include "RNA_types.h"
/* flush updates */
#include "DNA_object_types.h"
Modified: branches/render25/source/blender/makesrna/intern/rna_action_api.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_action_api.c
2010-05-07 12:01:32 UTC (rev 28649)
+++ branches/render25/source/blender/makesrna/intern/rna_action_api.c
2010-05-07 15:08:45 UTC (rev 28650)
@@ -30,7 +30,6 @@
#include <time.h>
#include "RNA_define.h"
-#include "RNA_types.h"
#include "DNA_action_types.h"
Modified: branches/render25/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_actuator.c
2010-05-07 12:01:32 UTC (rev 28649)
+++ branches/render25/source/blender/makesrna/intern/rna_actuator.c
2010-05-07 15:08:45 UTC (rev 28650)
@@ -25,7 +25,6 @@
#include <stdlib.h>
#include "RNA_define.h"
-#include "RNA_types.h"
#include "rna_internal.h"
#include "DNA_object_types.h"
Modified: branches/render25/source/blender/makesrna/intern/rna_animation.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_animation.c
2010-05-07 12:01:32 UTC (rev 28649)
+++ branches/render25/source/blender/makesrna/intern/rna_animation.c
2010-05-07 15:08:45 UTC (rev 28650)
@@ -26,7 +26,6 @@
#include "RNA_access.h"
#include "RNA_define.h"
-#include "RNA_types.h"
#include "RNA_enum_types.h"
#include "rna_internal.h"
Modified: branches/render25/source/blender/windowmanager/intern/wm_jobs.c
===================================================================
--- branches/render25/source/blender/windowmanager/intern/wm_jobs.c
2010-05-07 12:01:32 UTC (rev 28649)
+++ branches/render25/source/blender/windowmanager/intern/wm_jobs.c
2010-05-07 15:08:45 UTC (rev 28650)
@@ -49,7 +49,6 @@
#include "wm.h"
-#include "RNA_types.h"
/* ********************** Threaded Jobs Manager ******************************
*/
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
