[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47843] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Wed Jun 13 19:23:59 CEST 2012
Revision: 47843
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47843
Author: campbellbarton
Date: 2012-06-13 17:23:44 +0000 (Wed, 13 Jun 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/math_color.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/render_result.c
Modified: trunk/blender/source/blender/blenlib/intern/math_color.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_color.c 2012-06-13 16:21:43 UTC (rev 47842)
+++ trunk/blender/source/blender/blenlib/intern/math_color.c 2012-06-13 17:23:44 UTC (rev 47843)
@@ -381,15 +381,9 @@
void cpack_to_rgb(unsigned int col, float *r, float *g, float *b)
{
-
- *r = (float)((col) & 0xFF);
- *r /= 255.0f;
-
- *g = (float)(((col) >> 8) & 0xFF);
- *g /= 255.0f;
-
- *b = (float)(((col) >> 16) & 0xFF);
- *b /= 255.0f;
+ *r = ((float)(((col) ) & 0xFF)) * (1.0f / 255.0f);
+ *g = ((float)(((col) >> 8) & 0xFF)) * (1.0f / 255.0f);
+ *b = ((float)(((col) >> 16) & 0xFF)) * (1.0f / 255.0f);
}
void rgb_uchar_to_float(float col_r[3], const unsigned char col_ub[3])
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c 2012-06-13 16:21:43 UTC (rev 47842)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c 2012-06-13 17:23:44 UTC (rev 47843)
@@ -45,7 +45,7 @@
#include "MEM_guardedalloc.h"
-#include "BKE_animsys.h" /* <------ should this be here?, needed for sequencer update */
+#include "BKE_animsys.h" /* <------ should this be here?, needed for sequencer update */
#include "BKE_camera.h"
#include "BKE_global.h"
#include "BKE_image.h"
@@ -56,7 +56,7 @@
#include "BKE_scene.h"
#include "BKE_sequencer.h"
#include "BKE_utildefines.h"
-#include "BKE_writeavi.h" /* <------ should be replaced once with generic movie module */
+#include "BKE_writeavi.h" /* <------ should be replaced once with generic movie module */
#include "BLI_math.h"
#include "BLI_listbase.h"
@@ -127,7 +127,7 @@
static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovieHandle *mh, const char *name_override);
-static volatile int g_break= 0;
+static volatile int g_break = 0;
static int thread_break(void *UNUSED(arg))
{
return g_break;
@@ -145,13 +145,13 @@
uintptr_t mem_in_use, mmap_in_use, peak_memory;
float megs_used_memory, mmap_used_memory, megs_peak_memory;
- mem_in_use= MEM_get_memory_in_use();
- mmap_in_use= MEM_get_mapped_memory_in_use();
+ mem_in_use = MEM_get_memory_in_use();
+ mmap_in_use = MEM_get_mapped_memory_in_use();
peak_memory = MEM_get_peak_memory();
- megs_used_memory= (mem_in_use-mmap_in_use)/(1024.0*1024.0);
- mmap_used_memory= (mmap_in_use)/(1024.0*1024.0);
- megs_peak_memory = (peak_memory)/(1024.0*1024.0);
+ megs_used_memory = (mem_in_use - mmap_in_use) / (1024.0 * 1024.0);
+ mmap_used_memory = (mmap_in_use) / (1024.0 * 1024.0);
+ megs_peak_memory = (peak_memory) / (1024.0 * 1024.0);
fprintf(stdout, "Fra:%d Mem:%.2fM (%.2fM, peak %.2fM) ", rs->cfra,
megs_used_memory, mmap_used_memory, megs_peak_memory);
@@ -186,8 +186,8 @@
{
RenderPass *rpass;
- for (rpass=rl->passes.first; rpass; rpass= rpass->next)
- if (rpass->passtype== passtype)
+ for (rpass = rl->passes.first; rpass; rpass = rpass->next)
+ if (rpass->passtype == passtype)
return rpass->rect;
return NULL;
}
@@ -196,10 +196,10 @@
{
RenderLayer *rl;
- if (rr==NULL) return NULL;
+ if (rr == NULL) return NULL;
- for (rl= rr->layers.first; rl; rl= rl->next)
- if (strncmp(rl->name, name, RE_MAXNAME)==0)
+ for (rl = rr->layers.first; rl; rl = rl->next)
+ if (strncmp(rl->name, name, RE_MAXNAME) == 0)
return rl;
return NULL;
}
@@ -211,7 +211,7 @@
RenderLayer *render_get_active_layer(Render *re, RenderResult *rr)
{
- RenderLayer *rl= BLI_findlink(&rr->layers, re->r.actlay);
+ RenderLayer *rl = BLI_findlink(&rr->layers, re->r.actlay);
if (rl)
return rl;
@@ -223,7 +223,7 @@
{
SceneRenderLayer *srl;
- for (srl= re->scene->r.layers.first; srl; srl= srl->next)
+ for (srl = re->scene->r.layers.first; srl; srl = srl->next)
if (!(srl->layflag & SCE_LAY_DISABLE))
if (srl->passflag & SCE_PASS_VECTOR)
return 1;
@@ -238,8 +238,8 @@
Render *re;
/* search for existing renders */
- for (re= RenderGlobal.renderlist.first; re; re= re->next)
- if (strncmp(re->name, name, RE_MAXNAME)==0)
+ for (re = RenderGlobal.renderlist.first; re; re = re->next)
+ if (strncmp(re->name, name, RE_MAXNAME) == 0)
break;
return re;
@@ -270,7 +270,7 @@
{
/* for keeping render buffers */
if (re) {
- SWAP(RenderResult*, re->result, *rr);
+ SWAP(RenderResult *, re->result, *rr);
}
}
@@ -300,25 +300,25 @@
if (re->result) {
RenderLayer *rl;
- rr->rectx= re->result->rectx;
- rr->recty= re->result->recty;
+ rr->rectx = re->result->rectx;
+ rr->recty = re->result->recty;
- rr->rectf= re->result->rectf;
- rr->rectz= re->result->rectz;
- rr->rect32= re->result->rect32;
+ rr->rectf = re->result->rectf;
+ rr->rectz = re->result->rectz;
+ rr->rect32 = re->result->rect32;
/* active layer */
- rl= render_get_active_layer(re, re->result);
+ rl = render_get_active_layer(re, re->result);
if (rl) {
- if (rr->rectf==NULL)
- rr->rectf= rl->rectf;
- if (rr->rectz==NULL)
- rr->rectz= RE_RenderLayerGetPass(rl, SCE_PASS_Z);
+ if (rr->rectf == NULL)
+ rr->rectf = rl->rectf;
+ if (rr->rectz == NULL)
+ rr->rectz = RE_RenderLayerGetPass(rl, SCE_PASS_Z);
}
- rr->have_combined= (re->result->rectf != NULL);
- rr->layers= re->result->layers;
+ rr->have_combined = (re->result->rectf != NULL);
+ rr->layers = re->result->layers;
}
}
}
@@ -349,11 +349,11 @@
Render *re;
/* only one render per name exists */
- re= RE_GetRender(name);
- if (re==NULL) {
+ re = RE_GetRender(name);
+ if (re == NULL) {
/* new render data struct */
- re= MEM_callocN(sizeof(Render), "new render");
+ re = MEM_callocN(sizeof(Render), "new render");
BLI_addtail(&RenderGlobal.renderlist, re);
BLI_strncpy(re->name, name, RE_MAXNAME);
BLI_rw_mutex_init(&re->resultmutex);
@@ -362,7 +362,7 @@
RE_InitRenderCB(re);
/* init some variables */
- re->ycor= 1.0f;
+ re->ycor = 1.0f;
return re;
}
@@ -372,17 +372,17 @@
void RE_InitRenderCB(Render *re)
{
/* set default empty callbacks */
- re->display_init= result_nothing;
- re->display_clear= result_nothing;
- re->display_draw= result_rcti_nothing;
- re->progress= float_nothing;
- re->test_break= default_break;
+ re->display_init = result_nothing;
+ re->display_clear = result_nothing;
+ re->display_draw = result_rcti_nothing;
+ re->progress = float_nothing;
+ re->test_break = default_break;
if (G.background)
- re->stats_draw= stats_background;
+ re->stats_draw = stats_background;
else
- re->stats_draw= stats_nothing;
+ re->stats_draw = stats_nothing;
/* clear callback handles */
- re->dih= re->dch= re->ddh= re->sdh= re->prh= re->tbh= NULL;
+ re->dih = re->dch = re->ddh = re->sdh = re->prh = re->tbh = NULL;
}
/* only call this while you know it will remove the link too */
@@ -429,66 +429,66 @@
/* disprect is optional, if NULL it assumes full window render */
void RE_InitState(Render *re, Render *source, RenderData *rd, SceneRenderLayer *srl, int winx, int winy, rcti *disprect)
{
- re->ok= TRUE; /* maybe flag */
+ re->ok = TRUE; /* maybe flag */
- re->i.starttime= PIL_check_seconds_timer();
- re->r= *rd; /* hardcopy */
+ re->i.starttime = PIL_check_seconds_timer();
+ re->r = *rd; /* hardcopy */
- re->winx= winx;
- re->winy= winy;
+ re->winx = winx;
+ re->winy = winy;
if (disprect) {
- re->disprect= *disprect;
- re->rectx= disprect->xmax-disprect->xmin;
- re->recty= disprect->ymax-disprect->ymin;
+ re->disprect = *disprect;
+ re->rectx = disprect->xmax - disprect->xmin;
+ re->recty = disprect->ymax - disprect->ymin;
}
else {
re->disprect.xmin = re->disprect.ymin = 0;
re->disprect.xmax = winx;
re->disprect.ymax = winy;
- re->rectx= winx;
- re->recty= winy;
+ re->rectx = winx;
+ re->recty = winy;
}
if (re->rectx < 2 || re->recty < 2 || (BKE_imtype_is_movie(rd->im_format.imtype) &&
(re->rectx < 16 || re->recty < 16) ))
{
BKE_report(re->reports, RPT_ERROR, "Image too small");
- re->ok= 0;
+ re->ok = 0;
return;
}
- if ((re->r.mode & (R_OSA))==0)
+ if ((re->r.mode & (R_OSA)) == 0)
re->r.scemode &= ~R_FULL_SAMPLE;
#ifdef WITH_OPENEXR
if (re->r.scemode & R_FULL_SAMPLE)
- re->r.scemode |= R_EXR_TILE_FILE; /* enable automatic */
+ re->r.scemode |= R_EXR_TILE_FILE; /* enable automatic */
/* Until use_border is made compatible with save_buffers/full_sample, render without the later instead of not rendering at all.*/
if (re->r.mode & R_BORDER) {
- re->r.scemode &= ~(R_EXR_TILE_FILE|R_FULL_SAMPLE);
+ re->r.scemode &= ~(R_EXR_TILE_FILE | R_FULL_SAMPLE);
}
#else
/* can't do this without openexr support */
- re->r.scemode &= ~(R_EXR_TILE_FILE|R_FULL_SAMPLE);
+ re->r.scemode &= ~(R_EXR_TILE_FILE | R_FULL_SAMPLE);
#endif
/* fullsample wants uniform osa levels */
if (source && (re->r.scemode & R_FULL_SAMPLE)) {
/* but, if source has no full sample we disable it */
- if ((source->r.scemode & R_FULL_SAMPLE)==0)
+ if ((source->r.scemode & R_FULL_SAMPLE) == 0)
re->r.scemode &= ~R_FULL_SAMPLE;
else
- re->r.osa= re->osa= source->osa;
+ re->r.osa = re->osa = source->osa;
}
else {
/* check state variables, osa? */
if (re->r.mode & (R_OSA)) {
- re->osa= re->r.osa;
- if (re->osa>16) re->osa= 16;
+ re->osa = re->r.osa;
+ if (re->osa > 16) re->osa = 16;
}
- else re->osa= 0;
+ else re->osa = 0;
}
if (srl) {
@@ -506,25 +506,25 @@
BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
if (re->r.scemode & R_PREVIEWBUTS) {
- if (re->result && re->result->rectx==re->rectx && re->result->recty==re->recty);
+ if (re->result && re->result->rectx == re->rectx && re->result->recty == re->recty) ;
else {
render_result_free(re->result);
- re->result= NULL;
+ re->result = NULL;
}
}
else {
/* make empty render result, so display callbacks can initialize */
render_result_free(re->result);
- re->result= MEM_callocN(sizeof(RenderResult), "new render result");
- re->result->rectx= re->rectx;
- re->result->recty= re->recty;
+ re->result = MEM_callocN(sizeof(RenderResult), "new render result");
+ re->result->rectx = re->rectx;
+ re->result->recty = re->recty;
}
BLI_rw_mutex_unlock(&re->resultmutex);
/* we clip faces with a minimum of 2 pixel boundary outside of image border. see zbuf.c */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list