Commit: 715db49f420306a1e035ca315e6e67c6b6e28483
Author: Campbell Barton
Date: Tue Mar 17 13:22:01 2015 +1100
Branches: multiview
https://developer.blender.org/rB715db49f420306a1e035ca315e6e67c6b6e28483
Cleanup: remove redundant casts, vars
some odd expressions:
"(RenderView *)(&rr->views)->first" -> "rr->views.first"
===================================================================
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/intern/versioning_270.c
M
source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
M source/blender/editors/render/render_opengl.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/nodes/composite/nodes/node_composite_switchview.c
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/render/intern/source/pipeline.c
M source/blender/render/intern/source/render_result.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_draw.c
M source/blender/windowmanager/intern/wm_stereo.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index 4c46691..281cd1d 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3309,9 +3309,6 @@ static ImBuf *load_image_single(Image *ima, ImageUser
*iuser, int cfra,
char filepath[FILE_MAX];
struct ImBuf *ibuf = NULL;
int flag;
- ImageView *iv;
-
- iv = BLI_findlink(&ima->views, view_id);
/* is there a PackedFile with this image ? */
if (has_packed) {
diff --git a/source/blender/blenkernel/intern/scene.c
b/source/blender/blenkernel/intern/scene.c
index 1439c16..61cc81b 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -637,11 +637,11 @@ Scene *BKE_scene_add(Main *bmain, const char *name)
/* multiview - stereo */
BKE_scene_add_render_view(sce, STEREO_LEFT_NAME);
- srv = (SceneRenderView *)sce->r.views.first;
+ srv = sce->r.views.first;
BLI_strncpy(srv->suffix, STEREO_LEFT_SUFFIX, sizeof(srv->suffix));
BKE_scene_add_render_view(sce, STEREO_RIGHT_NAME);
- srv = (SceneRenderView *)sce->r.views.last;
+ srv = sce->r.views.last;
BLI_strncpy(srv->suffix, STEREO_RIGHT_SUFFIX, sizeof(srv->suffix));
/* game data */
@@ -2135,16 +2135,20 @@ size_t BKE_scene_num_views_get(const RenderData *rd)
return 1;
if (rd->views_format == SCE_VIEWS_FORMAT_STEREO_3D) {
- if (BLI_findstring(&rd->views, STEREO_LEFT_NAME,
offsetof(SceneRenderView, name)))
- totviews++;
+ if (BLI_findstring(&rd->views, STEREO_LEFT_NAME,
offsetof(SceneRenderView, name))) {
+ totviews++;
+ }
- if (BLI_findstring(&rd->views, STEREO_RIGHT_NAME,
offsetof(SceneRenderView, name)))
- totviews++;
+ if (BLI_findstring(&rd->views, STEREO_RIGHT_NAME,
offsetof(SceneRenderView, name))) {
+ totviews++;
+ }
}
else {
- for (srv = (SceneRenderView *)rd->views.first; srv; srv =
srv->next)
- if ((srv->viewflag & SCE_VIEW_DISABLE) == 0)
+ for (srv = rd->views.first; srv; srv = srv->next) {
+ if ((srv->viewflag & SCE_VIEW_DISABLE) == 0) {
totviews++;
+ }
+ }
}
return totviews;
}
diff --git a/source/blender/blenloader/intern/versioning_270.c
b/source/blender/blenloader/intern/versioning_270.c
index 054f946..6281ae0 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -475,11 +475,11 @@ void blo_do_versions_270(FileData *fd, Library
*UNUSED(lib), Main *main)
SceneRenderView *srv;
for (scene = main->scene.first; scene; scene =
scene->id.next) {
BKE_scene_add_render_view(scene,
STEREO_LEFT_NAME);
- srv = (SceneRenderView *)scene->r.views.first;
+ srv = scene->r.views.first;
BLI_strncpy(srv->suffix, STEREO_LEFT_SUFFIX,
sizeof(srv->suffix));
BKE_scene_add_render_view(scene,
STEREO_RIGHT_NAME);
- srv = (SceneRenderView *)scene->r.views.last;
+ srv = scene->r.views.last;
BLI_strncpy(srv->suffix, STEREO_RIGHT_SUFFIX,
sizeof(srv->suffix));
}
}
diff --git
a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
index 1497172..ccbab66 100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
@@ -69,7 +69,7 @@ void
*OutputOpenExrSingleLayerMultiViewOperation::get_handle(const char *filenam
IMB_exr_clear_channels(exrhandle);
- for (srv = (SceneRenderView *) this->m_rd->views.first; srv;
srv = srv->next) {
+ for (srv = (SceneRenderView *)this->m_rd->views.first; srv; srv
= srv->next) {
if (BKE_scene_render_view_active(this->m_rd, srv) ==
false)
continue;
diff --git a/source/blender/editors/render/render_opengl.c
b/source/blender/editors/render/render_opengl.c
index 0f63010..5ee5583 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -156,7 +156,7 @@ static void screen_opengl_views_setup(OGLRender *oglrender)
if (!is_multiview) {
/* we only have one view when multiview is off */
- rv = (RenderView *) rr->views.first;
+ rv = rr->views.first;
if (rv == NULL) {
rv = MEM_callocN(sizeof(RenderView), "new opengl render
view");
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index 2eb517d..7c599e7 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3530,7 +3530,7 @@ static bool view3d_stereo3d_active(const bContext *C,
Scene *scene, View3D *v3d,
if ((scene->r.scemode & R_MULTIVIEW) == 0)
return false;
- if (WM_stereo_enabled(C, win, true) == false)
+ if (WM_stereo_enabled(win, true) == false)
return false;
if ((v3d->camera == NULL) || rv3d->persp != RV3D_CAMOB)
diff --git a/source/blender/nodes/composite/nodes/node_composite_switchview.c
b/source/blender/nodes/composite/nodes/node_composite_switchview.c
index d09d40a..3896dac 100644
--- a/source/blender/nodes/composite/nodes/node_composite_switchview.c
+++ b/source/blender/nodes/composite/nodes/node_composite_switchview.c
@@ -86,7 +86,7 @@ static void cmp_node_switch_view_update(bNodeTree *ntree,
bNode *node)
}
/* add the new views */
- for (srv = (SceneRenderView *)scene->r.views.first; srv; srv =
srv->next) {
+ for (srv = scene->r.views.first; srv; srv = srv->next) {
sock = BLI_findstring(&node->inputs, srv->name,
offsetof(bNodeSocket, name));
if (sock == NULL)
@@ -117,7 +117,7 @@ static void init_switch_view(const bContext *C, PointerRNA
*ptr)
if (scene) {
RenderData *rd = &scene->r;
- for (nr = 0, srv = (SceneRenderView *)rd->views.first; srv; srv
= srv->next, nr++) {
+ for (nr = 0, srv = rd->views.first; srv; srv = srv->next, nr++)
{
sock = ntreeCompositSwitchViewAddSocket(ntree, node,
srv->name);
if ((srv->viewflag & SCE_VIEW_DISABLE))
diff --git a/source/blender/render/extern/include/RE_pipeline.h
b/source/blender/render/extern/include/RE_pipeline.h
index 7ebc017..d8f1fbb 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -352,9 +352,9 @@ bool RE_RenderResult_is_stereo(RenderResult *res);
float *RE_RenderViewGetRectf(struct RenderResult *rr, const int view_id);
float *RE_RenderViewGetRectz(struct RenderResult *rr, const int view_id);
-int *RE_RenderViewGetRect32(struct RenderResult *rr, const int view_id);
-void RE_RenderViewSetRectf(struct RenderResult *res, const int view_id, float
*rect);
-void RE_RenderViewSetRectz(struct RenderResult *res, const int view_id, float
*rect);
+int *RE_RenderViewGetRect32(struct RenderResult *rr, const int view_id);
+void RE_RenderViewSetRectf(struct RenderResult *res, const int view_id,
float *rect);
+void RE_RenderViewSetRectz(struct RenderResult *res, const int view_id,
float *rect);
#endif /* __RE_PIPELINE_H__ */
diff --git a/source/blender/render/intern/source/pipeline.c
b/source/blender/render/intern/source/pipeline.c
index 0065d58..d8397e8 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -337,7 +337,7 @@ void RE_AcquireResultImageViews(Render *re, RenderResult
*rr)
/* creates a temporary duplication of views */
render_result_views_shallowcopy(rr, re->result);
- rv = (RenderView *)rr->views.first;
+ rv = rr->views.first;
rr->have_combined = (rv->rectf != NULL);
@@ -2478,7 +2478,7 @@ static void renderresult_stampinfo(Render *re)
/* this is the basic trick to get the displayed float or char rect from
render result */
nr = 0;
- for (rv = (RenderView *)re->result->views.first;rv;rv=rv->next, nr++) {
+ for (rv = re->result->views.first;rv;rv = rv->next, nr++) {
RE_SetActiveRenderView(re, rv->name);
RE_AcquireResultImage(re, &rres, nr);
BKE_image_stamp_buf(re->scene, RE_GetCamera(re), (unsigned char
*)rv->rect32, rv->rectf, rres.rectx, rres.recty, 4);
@@ -3107,7 +3107,7 @@ bool RE_WriteRenderViewsImage(ReportList *reports,
RenderResult *rr, Scene *scen
BLI_strncpy(filepath, name, sizeof(filepath));
- for (view_id = 0, rv = (RenderView *) rr->views.first; rv; rv =
rv->next, view_id++) {
+ for (view_id = 0, rv = rr->views.first; rv; rv = rv->next,
view_id++) {
BKE_scene_view_filepath_get(&scene->r, filepath,
rv->name, name);
if (rd->im_format.imtype == R_IMF_IMTYPE_MULTILAYER) {
diff --git a/source/blender/render/intern/source/render_result.c
b/source/blender/render/intern/source/render_result.c
index 1b249f6..4fba384 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -144,7 +144,7 @@ void render_result_views_shallowcopy(RenderResult *dst,
RenderResult *src)
if (dst == NULL || src == NULL)
return;
- for (rview = (RenderView *)src->views.first; rview; rview =
rview->next) {
+ for (rview = src->views.first; rview; rview = rview->next) {
RenderView *rv;
rv = MEM_mallocN(sizeof(RenderView), "new render view");
@@ -623,7 +623,7 @@ RenderResult *render_result_new(Render *re, rcti *partrct,
int crop, int savebuf
rl->exrhandle = IMB_exr_get_handle();
}
- for (rv = (RenderView *)(&rr->views)->first; rv; rv=rv->next) {
+ for (rv = rr->views.first; rv; rv = rv->next) {
const char *view = rv->name;
if (viewname && viewname[0])
@@ -719,7 +719,7 @@ RenderResult *render_result_new(Render *re, rcti *partrct,
int crop, int savebuf
rl->exrhandle = IMB_exr_get_handle();
}
- for (rv = (RenderView *)(&rr->views)->first; rv; rv=rv->next) {
+ for (rv = rr->views.first; rv; rv = rv->next) {
const char *view = rv->name;
if (viewname && viewname[0])
@@ -1039,7 +1039,7 @@ bool RE_WriteRenderResult(ReportList *reports,
RenderResult *rr, const char *fil
if (imf && imf->imtype == R_IMF_IMTYPE_OPENEXR && multiview) {
/* single layer OpenEXR */
const char *RGBAZ[] = {"R", "G", "B", "A", "Z"};
- for (nr = 0, rview = (RenderView *) rr->views.first; rview;
rview = rview->next, nr++) {
+ for (nr = 0, rview = rr->views.first; rview; rview =
rview->next, nr++) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
