[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55058] trunk/blender/source: code cleanup : also change BKE_blender.h BLENDER_VERSION_CHAR to 'a' so as not to confuse things.
Campbell Barton
ideasman42 at gmail.com
Tue Mar 5 15:47:49 CET 2013
Revision: 55058
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55058
Author: campbellbarton
Date: 2013-03-05 14:47:49 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
code cleanup: also change BKE_blender.h BLENDER_VERSION_CHAR to 'a' so as not to confuse things.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenlib/intern/storage.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/collada/collada_utils.cpp
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.c
trunk/blender/source/blender/imbuf/intern/rectop.c
trunk/blender/source/blender/render/intern/source/bake.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2013-03-05 14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2013-03-05 14:47:49 UTC (rev 55058)
@@ -50,7 +50,7 @@
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR
+#define BLENDER_VERSION_CHAR a
/* alpha/beta/rc/release, docs use this */
#define BLENDER_VERSION_CYCLE alpha
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2013-03-05 14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2013-03-05 14:47:49 UTC (rev 55058)
@@ -783,10 +783,8 @@
/* goalfac= 1.0f; */ /* UNUSED */
- /*
// Kicking goal factor to simplify things...who uses that anyway?
// ABS ( clmd->sim_parms->maxgoal - clmd->sim_parms->mingoal );
- */
verts->goal = powf(verts->goal, 4.0f);
if ( verts->goal >= SOFTGOALSNAP )
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2013-03-05 14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2013-03-05 14:47:49 UTC (rev 55058)
@@ -654,7 +654,7 @@
{
int i;
- *collisions = (CollPair *) MEM_mallocN(sizeof(CollPair) * numresult * 64, "collision array" ); //*4 since cloth_collision_static can return more than 1 collision
+ *collisions = (CollPair *) MEM_mallocN(sizeof(CollPair) * numresult * 64, "collision array" ); // * 4 since cloth_collision_static can return more than 1 collision
*collisions_index = *collisions;
for ( i = 0; i < numresult; i++ ) {
Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/storage.c 2013-03-05 14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/blenlib/intern/storage.c 2013-03-05 14:47:49 UTC (rev 55058)
@@ -453,8 +453,7 @@
void BLI_free_filelist(struct direntry *filelist, unsigned int nrentries)
{
unsigned int i;
- for (i = 0; i < nrentries; ++i)
- {
+ for (i = 0; i < nrentries; ++i) {
struct direntry * const entry = filelist + i;
if (entry->image) {
IMB_freeImBuf(entry->image);
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-05 14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-03-05 14:47:49 UTC (rev 55058)
@@ -5309,8 +5309,9 @@
/* link cache */
direct_link_pointcache_list(fd, &rbw->ptcaches, &rbw->pointcache, FALSE);
/* make sure simulation starts from the beginning after loading file */
- if (rbw->pointcache)
- rbw->ltime = rbw->pointcache->startframe;
+ if (rbw->pointcache) {
+ rbw->ltime = (float)rbw->pointcache->startframe;
+ }
}
}
@@ -8721,7 +8722,7 @@
}
else if (main->versionfile < 266 || (main->versionfile == 266 && main->subversionfile < 1)) {
/* texture use alpha was removed for 2.66 but added back again for 2.66a,
- * for compatibility all textures assumed it to be enabled */
+ * for compatibility all textures assumed it to be enabled */
Tex *tex;
for (tex = main->tex.first; tex; tex = tex->id.next)
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2013-03-05 14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2013-03-05 14:47:49 UTC (rev 55058)
@@ -2575,7 +2575,7 @@
/* to be able to restore quit.blend and temp saves, the packed blend has to be in undo buffers... */
/* XXX needs rethink, just like save UI in undo files now - would be nice to append things only for the]
- quit.blend and temp saves */
+ * quit.blend and temp saves */
if (foundone) {
writestruct(wd, ID_LI, "Library", 1, main->curlib);
Modified: trunk/blender/source/blender/collada/collada_utils.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_utils.cpp 2013-03-05 14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/collada/collada_utils.cpp 2013-03-05 14:47:49 UTC (rev 55058)
@@ -116,12 +116,12 @@
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
DAG_id_tag_update(&par->id, OB_RECALC_OB);
- /** done once after import
+ /** done once after import */
+#if 0
DAG_relations_tag_update(bmain);
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
- */
+#endif
-
return true;
}
@@ -299,15 +299,17 @@
return CustomData_get_active_layer_index(&me->fdata, CD_MTFACE);
}
-std::string bc_url_encode(std::string data) {
+std::string bc_url_encode(std::string data)
+{
/* XXX We probably do not need to do a full encoding.
- But in case that is necessary,then it can be added here.
- */
+ * But in case that is necessary,then it can be added here.
+ */
return bc_replace_string(data,"#", "%23");
}
std::string bc_replace_string(std::string data, const std::string& pattern,
- const std::string& replacement) {
+ const std::string& replacement)
+{
size_t pos = 0;
while((pos = data.find(pattern, pos)) != std::string::npos) {
data.replace(pos, pattern.length(), replacement);
@@ -317,15 +319,15 @@
}
/**
- Calculate a rescale factor such that the imported scene's scale
- is preserved. I.e. 1 meter in the import will also be
- 1 meter in the current scene.
- XXX : I am not sure if it is correct to map 1 Blender Unit
- to 1 Meter for unit type NONE. But it looks reasonable to me.
-*/
+ * Calculate a rescale factor such that the imported scene's scale
+ * is preserved. I.e. 1 meter in the import will also be
+ * 1 meter in the current scene.
+ * XXX : I am not sure if it is correct to map 1 Blender Unit
+ * to 1 Meter for unit type NONE. But it looks reasonable to me.
+ */
void bc_match_scale(std::vector<Object *> *objects_done,
- Scene &sce,
- UnitConverter &bc_unit) {
+ Scene &sce,
+ UnitConverter &bc_unit) {
Object *ob = NULL;
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c 2013-03-05 14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/editors/render/render_preview.c 2013-03-05 14:47:49 UTC (rev 55058)
@@ -431,7 +431,7 @@
/* show alpha in this case */
if (tex == NULL || (tex->flag & TEX_PRV_ALPHA)) {
- if (!(tex && tex->type == TEX_IMAGE && (tex->imaflag & (TEX_USEALPHA|TEX_CALCALPHA)) == 0)) {
+ if (!(tex && tex->type == TEX_IMAGE && (tex->imaflag & (TEX_USEALPHA | TEX_CALCALPHA)) == 0)) {
mat->mtex[0]->mapto |= MAP_ALPHA;
mat->alpha = 0.0f;
}
Modified: trunk/blender/source/blender/imbuf/intern/anim_movie.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim_movie.c 2013-03-05 14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/imbuf/intern/anim_movie.c 2013-03-05 14:47:49 UTC (rev 55058)
@@ -822,10 +822,10 @@
if (rval == AVERROR_EOF) {
/* this sets size and data fields to zero,
- which is necessary to decode the remaining data
- in the decoder engine after EOF. It also prevents a memory
- leak, since av_read_frame spills out a full size packet even
- on EOF... (and: it's save to call on NULL packets) */
+ * which is necessary to decode the remaining data
+ * in the decoder engine after EOF. It also prevents a memory
+ * leak, since av_read_frame spills out a full size packet even
+ * on EOF... (and: it's save to call on NULL packets) */
av_free_packet(&anim->next_packet);
Modified: trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c 2013-03-05 14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c 2013-03-05 14:47:49 UTC (rev 55058)
@@ -141,7 +141,7 @@
if (ibuf->rect_float != 0 && bitspersample != 8) {
/* don't use the float buffer to save 8 bpp picture to prevent color banding
- (there's no dithering algorithm behing the logImageSetDataRGBA function) */
+ * (there's no dithering algorithm behing the logImageSetDataRGBA function) */
fbuf = (float *)MEM_mallocN(ibuf->x * ibuf->y * 4 * sizeof(float), "fbuf in imb_save_dpx_cineon");
Modified: trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.c 2013-03-05 14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/imbuf/intern/cineon/logImageCore.c 2013-03-05 14:47:49 UTC (rev 55058)
@@ -374,7 +374,7 @@
LogImageElement mergedElement;
/* Determine the depth of the picture and if there's a separate alpha element.
- If the element is supported, load it into an unsigned ints array. */
+ * If the element is supported, load it into an unsigned ints array. */
memset(&elementData, 0, 8 * sizeof(float *));
hasAlpha = 0;
Modified: trunk/blender/source/blender/imbuf/intern/rectop.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/rectop.c 2013-03-05 14:45:02 UTC (rev 55057)
+++ trunk/blender/source/blender/imbuf/intern/rectop.c 2013-03-05 14:47:49 UTC (rev 55058)
@@ -517,7 +517,7 @@
dr = drect;
sr = srect;
for (x = width; x > 0; x--, dr++, sr++) {
- if(*sr & IB_ALPHA_MASK)
+ if (*sr & IB_ALPHA_MASK)
func((char *)dr, (char *)dr, (char *)sr, ((char *)sr)[3]);
}
Modified: trunk/blender/source/blender/render/intern/source/bake.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list