[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57559] branches/multiview: multiview : merging from github branch
Dalai Felinto
dfelinto at gmail.com
Wed Jun 19 00:33:55 CEST 2013
Revision: 57559
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57559
Author: dfelinto
Date: 2013-06-18 22:33:54 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
multiview : merging from github branch
NOTE: not very different than last commit, but now with a lot of the changes proposed in the review
(mostly code changes, so nothign different for the user)
(or better, the version used for the git pull)
github: 40e462c776dd92207c488e9f0e7be10af5e7bb68
http://github.com/dfelinto/blender/tree/multiview
note: this is trunk/svn revision: 57417
Modified Paths:
--------------
branches/multiview/intern/cycles/blender/blender_session.cpp
branches/multiview/release/scripts/startup/bl_ui/space_userpref.py
branches/multiview/source/blender/blenkernel/BKE_scene.h
branches/multiview/source/blender/blenkernel/intern/image.c
branches/multiview/source/blender/blenkernel/intern/object.c
branches/multiview/source/blender/blenkernel/intern/scene.c
branches/multiview/source/blender/blenlib/intern/path_util.c
branches/multiview/source/blender/blenloader/intern/readfile.c
branches/multiview/source/blender/compositor/intern/COM_CompositorContext.h
branches/multiview/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/multiview/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
branches/multiview/source/blender/editors/render/render_internal.c
branches/multiview/source/blender/editors/space_image/image_buttons.c
branches/multiview/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/multiview/source/blender/makesdna/DNA_screen_types.h
branches/multiview/source/blender/makesdna/DNA_userdef_types.h
branches/multiview/source/blender/makesdna/DNA_windowmanager_types.h
branches/multiview/source/blender/makesrna/intern/rna_nodetree.c
branches/multiview/source/blender/makesrna/intern/rna_render.c
branches/multiview/source/blender/makesrna/intern/rna_scene.c
branches/multiview/source/blender/makesrna/intern/rna_userdef.c
branches/multiview/source/blender/nodes/composite/nodes/node_composite_switchview.c
branches/multiview/source/blender/render/extern/include/RE_pipeline.h
branches/multiview/source/blender/render/intern/include/render_result.h
branches/multiview/source/blender/render/intern/source/pipeline.c
branches/multiview/source/blender/render/intern/source/render_result.c
branches/multiview/source/blender/windowmanager/intern/wm_draw.c
branches/multiview/source/blender/windowmanager/intern/wm_operators.c
branches/multiview/source/blender/windowmanager/intern/wm_stereo.c
branches/multiview/source/blender/windowmanager/intern/wm_window.c
branches/multiview/source/blender/windowmanager/wm_draw.h
branches/multiview/source/blender/windowmanager/wm_stereo.h
branches/multiview/source/creator/creator.c
Modified: branches/multiview/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/multiview/intern/cycles/blender/blender_session.cpp 2013-06-18 20:11:58 UTC (rev 57558)
+++ branches/multiview/intern/cycles/blender/blender_session.cpp 2013-06-18 22:33:54 UTC (rev 57559)
@@ -168,9 +168,8 @@
sync = new BlenderSync(b_engine, b_data, b_scene, scene, !background, session->progress, session_params.device.type == DEVICE_CPU);
if(b_rv3d) {
- BL::Object camera = b_engine.multiview_camera();
- sync->sync_data(b_v3d, camera);
- sync->sync_camera(b_render, camera, width, height);
+ sync->sync_data(b_v3d, b_engine.camera_override());
+ sync->sync_camera(b_render, b_engine.camera_override(), width, height);
}
BufferParams buffer_params = BlenderSync::get_buffer_params(b_render, b_scene, PointerRNA_NULL, PointerRNA_NULL, scene->camera, width, height);
@@ -262,11 +261,6 @@
b_engine.end_result(b_rr, (int)cancel);
}
-static void render_result_actview_set(BL::RenderEngine b_engine, int view)
-{
- b_engine.result_actview_set(view);
-}
-
void BlenderSession::do_write_update_render_tile(RenderTile& rtile, bool do_update_only)
{
BufferParams& params = rtile.buffers->params;
@@ -355,7 +349,7 @@
}
/* set the current view */
- render_result_actview_set(b_engine, b_rview_id);
+ b_engine.active_view_set(b_rview_id);
BL::RenderLayer b_rlay = *b_single_rlay;
@@ -388,9 +382,8 @@
scene->integrator->tag_update(scene);
/* update scene */
- BL::Object camera = b_engine.multiview_camera();
- sync->sync_camera(b_render, camera, width, height);
- sync->sync_data(b_v3d, camera, b_rlay_name.c_str());
+ sync->sync_camera(b_render, b_engine.camera_override(), width, height);
+ sync->sync_data(b_v3d, b_engine.camera_override(), b_rlay_name.c_str());
/* update number of samples per layer */
int samples = sync->get_layer_samples();
@@ -504,13 +497,12 @@
}
/* data and camera synchronize */
- BL::Object camera = b_engine.multiview_camera();
- sync->sync_data(b_v3d, camera);
+ sync->sync_data(b_v3d, b_engine.camera_override());
if(b_rv3d)
sync->sync_view(b_v3d, b_rv3d, width, height);
else
- sync->sync_camera(b_render, camera, width, height);
+ sync->sync_camera(b_render, b_engine.camera_override(), width, height);
/* unlock */
session->scene->mutex.unlock();
Modified: branches/multiview/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- branches/multiview/release/scripts/startup/bl_ui/space_userpref.py 2013-06-18 20:11:58 UTC (rev 57558)
+++ branches/multiview/release/scripts/startup/bl_ui/space_userpref.py 2013-06-18 22:33:54 UTC (rev 57559)
@@ -403,21 +403,21 @@
col.separator()
col.separator()
- col.label(text="3-D Display:")
+ col.label(text="3D Stereo Display:")
col.prop(system, "stereo_display", text="")
if system.stereo_display == 'ANAGLYPH':
- col.prop(system, "anaglyph_type", text="Type")
+ col.prop(system, "stereo_anaglyph_type", text="Type")
if system.stereo_display == 'EPILEPSY':
- col.prop(system, "epilepsy_interval")
+ col.prop(system, "stereo_epilepsy_interval")
if system.stereo_display == 'INTERLACE':
- col.prop(system, "interlace_type", text="Type")
- col.prop(system, "use_interlace_swap")
+ col.prop(system, "stereo_interlace_type", text="Type")
+ col.prop(system, "use_stereo_interlace_swap")
if system.stereo_display == 'SIDEBYSIDE':
- col.prop(system, "use_sidebyside_crosseyed")
+ col.prop(system, "use_stereo_sidebyside_crosseyed")
# 2. Column
column = split.column()
Modified: branches/multiview/source/blender/blenkernel/BKE_scene.h
===================================================================
--- branches/multiview/source/blender/blenkernel/BKE_scene.h 2013-06-18 20:11:58 UTC (rev 57558)
+++ branches/multiview/source/blender/blenkernel/BKE_scene.h 2013-06-18 22:33:54 UTC (rev 57559)
@@ -108,7 +108,7 @@
int BKE_scene_remove_render_layer(struct Main *main, struct Scene *scene, struct SceneRenderLayer *srl);
struct SceneRenderView *BKE_scene_add_render_view(struct Scene *sce, const char *name);
-int BKE_scene_remove_render_view(struct Scene *scene, struct SceneRenderView *srv);
+bool BKE_scene_remove_render_view(struct Scene *scene, struct SceneRenderView *srv);
/* render profile */
int get_render_subsurf_level(struct RenderData *r, int level);
Modified: branches/multiview/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/multiview/source/blender/blenkernel/intern/image.c 2013-06-18 20:11:58 UTC (rev 57558)
+++ branches/multiview/source/blender/blenkernel/intern/image.c 2013-06-18 22:33:54 UTC (rev 57559)
@@ -2731,8 +2731,10 @@
if (iuser && (iuser->flag & IMA_STEREO3D)) {
/* view == 0 shows stereo */
- if (actview-- == 0)
+ if (actview == 0)
actview = iuser->eye;
+ else
+ actview = actview - 1;
}
if (from_render) {
Modified: branches/multiview/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/multiview/source/blender/blenkernel/intern/object.c 2013-06-18 20:11:58 UTC (rev 57558)
+++ branches/multiview/source/blender/blenkernel/intern/object.c 2013-06-18 22:33:54 UTC (rev 57559)
@@ -362,6 +362,7 @@
bScreen *sc;
Scene *sce;
SceneRenderLayer *srl;
+ SceneRenderView *srv;
FreestyleLineSet *lineset;
Curve *cu;
Tex *tex;
@@ -623,6 +624,11 @@
BKE_unlink_linestyle_target_object(lineset->linestyle, ob);
}
}
+
+ for (srv = sce->r.views.first; srv; srv = srv->next) {
+ if (srv->camera == ob)
+ srv->camera = NULL;
+ }
}
sce = sce->id.next;
Modified: branches/multiview/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/multiview/source/blender/blenkernel/intern/scene.c 2013-06-18 20:11:58 UTC (rev 57558)
+++ branches/multiview/source/blender/blenkernel/intern/scene.c 2013-06-18 22:33:54 UTC (rev 57559)
@@ -1400,18 +1400,17 @@
return srv;
}
-int BKE_scene_remove_render_view(Scene *scene, SceneRenderView *srv)
+bool BKE_scene_remove_render_view(Scene *scene, SceneRenderView *srv)
{
const int act = BLI_findindex(&scene->r.views, srv);
if (act == -1) {
- return 0;
+ return FALSE;
}
- else if ( (scene->r.views.first == scene->r.views.last) &&
- (scene->r.views.first == srv))
+ else if (scene->r.views.first == scene->r.views.last)
{
/* ensure 1 view is kept */
- return 0;
+ return FALSE;
}
BLI_remlink(&scene->r.views, srv);
@@ -1419,7 +1418,7 @@
scene->r.actview = 0;
- return 1;
+ return TRUE;
}
/* render simplification */
Modified: branches/multiview/source/blender/blenlib/intern/path_util.c
===================================================================
--- branches/multiview/source/blender/blenlib/intern/path_util.c 2013-06-18 20:11:58 UTC (rev 57558)
+++ branches/multiview/source/blender/blenlib/intern/path_util.c 2013-06-18 22:33:54 UTC (rev 57559)
@@ -1967,23 +1967,7 @@
return BLI_REBASE_OK;
}
-
/**
- * Returns pointer to the rightmost period in string.
- */
-const char *BLI_last_period(const char *string)
-{
- const char * const lfslash = strrchr(string, '.');
- const char * const lbslash = strrchr(string, '.');
-
- if (!lfslash) return lbslash;
- else if (!lbslash) return lfslash;
-
- if ((intptr_t)lfslash < (intptr_t)lbslash) return lbslash;
- else return lfslash;
-}
-
-/**
* Returns pointer to the leftmost path separator in string. Not actually used anywhere.
*/
const char *BLI_first_slash(const char *string)
Modified: branches/multiview/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/multiview/source/blender/blenloader/intern/readfile.c 2013-06-18 20:11:58 UTC (rev 57558)
+++ branches/multiview/source/blender/blenloader/intern/readfile.c 2013-06-18 22:33:54 UTC (rev 57559)
@@ -5497,11 +5497,8 @@
win->modalhandlers.first = win->modalhandlers.last = NULL;
win->subwindows.first = win->subwindows.last = NULL;
win->gesture.first = win->gesture.last = NULL;
-
- win->drawdata = NULL;
- win->drawdataall = NULL;
- win->drawdatastereo = NULL;
- win->drawdatastereoall = NULL;
+ win->drawdata.first = win->drawdata.last = NULL;
+
win->drawmethod = -1;
win->drawfail = 0;
win->active = 0;
Modified: branches/multiview/source/blender/compositor/intern/COM_CompositorContext.h
===================================================================
--- branches/multiview/source/blender/compositor/intern/COM_CompositorContext.h 2013-06-18 20:11:58 UTC (rev 57558)
+++ branches/multiview/source/blender/compositor/intern/COM_CompositorContext.h 2013-06-18 22:33:54 UTC (rev 57559)
@@ -90,9 +90,6 @@
*/
int m_view_id;
- /* @brief active view name */
- char m_view[64];
-
public:
/**
* @brief constructor initializes the context with default values.
Modified: branches/multiview/source/blender/compositor/intern/COM_ExecutionSystem.cpp
===================================================================
--- branches/multiview/source/blender/compositor/intern/COM_ExecutionSystem.cpp 2013-06-18 20:11:58 UTC (rev 57558)
+++ branches/multiview/source/blender/compositor/intern/COM_ExecutionSystem.cpp 2013-06-18 22:33:54 UTC (rev 57559)
@@ -49,7 +49,7 @@
ExecutionSystem::ExecutionSystem(RenderData *rd, bNodeTree *editingtree, bool rendering, bool fastcalculation,
const ColorManagedViewSettings *viewSettings, const ColorManagedDisplaySettings *displaySettings,
- int view_id)
+ int view_id)
{
this->m_context.setViewId(view_id);
this->m_context.setbNodeTree(editingtree);
Modified: branches/multiview/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
===================================================================
--- branches/multiview/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp 2013-06-18 20:11:58 UTC (rev 57558)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list