[Bf-blender-cvs] [926a56a] multiview: Merge remote-tracking branch 'origin/master' into multiview
Dalai Felinto
noreply at git.blender.org
Tue Mar 31 04:47:07 CEST 2015
Commit: 926a56a5a6ae7b1b016753867f99c1d5e11c78f2
Author: Dalai Felinto
Date: Mon Mar 30 23:28:13 2015 -0300
Branches: multiview
https://developer.blender.org/rB926a56a5a6ae7b1b016753867f99c1d5e11c78f2
Merge remote-tracking branch 'origin/master' into multiview
Way too many conflicts this time, and the last merge was less than 10
days ago! Sequencer was what changed the most (the proxy commits in
master) but I think the changes are all good in multiview now (I haven't
tested them, but the code seems fine).
Conflicts:
intern/cycles/blender/blender_camera.cpp
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/BKE_writeavi.h
source/blender/blenkernel/BKE_writeffmpeg.h
source/blender/blenkernel/BKE_writeframeserver.h
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/writeavi.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenkernel/intern/writeframeserver.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/screendump.c
source/blender/imbuf/intern/indexer.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/quicktime/apple/qtkit_export.m
source/blender/quicktime/quicktime_export.h
source/blender/render/intern/source/external_engine.c
source/blender/render/intern/source/pipeline.c
===================================================================
===================================================================
diff --cc intern/cycles/blender/blender_camera.cpp
index cd5acfc,5b3e666..fffc46e
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@@ -506,16 -501,16 +506,16 @@@ static void blender_camera_view_subset(
/* get viewport viewplane */
BlenderCamera view_bcam;
- blender_camera_init(&view_bcam, b_render, b_scene);
+ blender_camera_init(&view_bcam, b_render);
- blender_camera_from_view(&view_bcam, b_scene, b_v3d, b_rv3d, width, height, true);
+ blender_camera_from_view(&view_bcam, b_engine, b_scene, b_v3d, b_rv3d, width, height, true);
blender_camera_viewplane(&view_bcam, width, height,
&view, &view_aspect, &sensor_size);
/* get camera viewplane */
BlenderCamera cam_bcam;
- blender_camera_init(&cam_bcam, b_render, b_scene);
+ blender_camera_init(&cam_bcam, b_render);
- blender_camera_from_object(&cam_bcam, b_ob, true);
+ blender_camera_from_object(&cam_bcam, b_engine, b_ob, true);
blender_camera_viewplane(&cam_bcam, cam_bcam.full_width, cam_bcam.full_height,
&cam, &cam_aspect, &sensor_size);
@@@ -609,9 -601,9 +609,9 @@@ static void blender_camera_border(Blend
void BlenderSync::sync_view(BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height)
{
BlenderCamera bcam;
- blender_camera_init(&bcam, b_scene.render(), b_scene);
+ blender_camera_init(&bcam, b_scene.render());
- blender_camera_from_view(&bcam, b_scene, b_v3d, b_rv3d, width, height);
- blender_camera_border(&bcam, b_scene.render(), b_scene, b_v3d, b_rv3d, width, height);
+ blender_camera_from_view(&bcam, b_engine, b_scene, b_v3d, b_rv3d, width, height);
+ blender_camera_border(&bcam, b_engine, b_scene.render(), b_scene, b_v3d, b_rv3d, width, height);
blender_camera_sync(scene->camera, &bcam, width, height);
}
diff --cc intern/cycles/blender/blender_session.cpp
index 4f4f11c,4f428bb..17bab0a
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@@ -350,10 -350,10 +350,10 @@@ void BlenderSession::do_write_update_re
int h = params.height;
/* get render result */
- BL::RenderResult b_rr = begin_render_result(b_engine, x, y, w, h, b_rlay_name.c_str());
+ BL::RenderResult b_rr = begin_render_result(b_engine, x, y, w, h, b_rlay_name.c_str(), b_rview_name.c_str());
/* can happen if the intersected rectangle gives 0 width or height */
- if (b_rr.ptr.data == NULL) {
+ if(b_rr.ptr.data == NULL) {
return;
}
diff --cc source/blender/blenkernel/BKE_node.h
index e8eb6b7,ee63771..eca15a6
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -979,10 -974,8 +975,9 @@@ void ntreeGPUMaterialNodes(s
#define CMP_TRACKPOS_ABSOLUTE_FRAME 3
/* API */
- struct CompBuf;
void ntreeCompositExecTree(struct Scene *scene, struct bNodeTree *ntree, struct RenderData *rd, int rendering, int do_previews,
- const struct ColorManagedViewSettings *view_settings, const struct ColorManagedDisplaySettings *display_settings);
+ const struct ColorManagedViewSettings *view_settings, const struct ColorManagedDisplaySettings *display_settings,
+ const char *view_name);
void ntreeCompositTagRender(struct Scene *sce);
int ntreeCompositTagAnimated(struct bNodeTree *ntree);
void ntreeCompositTagGenerators(struct bNodeTree *ntree);
diff --cc source/blender/blenkernel/BKE_sequencer.h
index d7e416c,8481827..4a45489
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@@ -41,9 -41,6 +41,7 @@@ struct Mask
struct Scene;
struct Sequence;
struct SequenceModifierData;
+struct Stereo3dFormat;
- struct Strip;
struct StripElem;
struct bSound;
diff --cc source/blender/blenkernel/BKE_writeavi.h
index 680506a,bc06be0..ca295c5
--- a/source/blender/blenkernel/BKE_writeavi.h
+++ b/source/blender/blenkernel/BKE_writeavi.h
@@@ -43,19 -43,16 +43,20 @@@ struct ReportList
struct Scene;
typedef struct bMovieHandle {
- int (*start_movie)(void *context_v, struct Scene *scene, struct RenderData *rd, int rectx, int recty, const char *suffix, struct ReportList *reports);
- int (*start_movie)(struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports, bool preview);
- int (*append_movie)(struct RenderData *rd, int start_frame, int frame, int *pixels,
- int rectx, int recty, struct ReportList *reports);
- void (*end_movie)(void);
- int (*get_next_frame)(struct RenderData *rd, struct ReportList *reports); /* optional */
- void (*get_movie_path)(char *string, struct RenderData *rd, bool preview); /* optional */
++ int (*start_movie)(void *context_v, struct Scene *scene, struct RenderData *rd, int rectx, int recty,
++ struct ReportList *reports, bool preview, const char *suffix);
+ int (*append_movie)(void *context_v, struct RenderData *rd, int start_frame, int frame, int *pixels,
+ int rectx, int recty, const char *suffix, struct ReportList *reports);
+ void (*end_movie)(void *context_v);
+ int (*get_next_frame)(void *context_v, struct RenderData *rd, struct ReportList *reports); /* optional */
- void (*get_movie_path)(char *string, struct RenderData *rd, const char *suffix); /* optional */
++ void (*get_movie_path)(char *string, struct RenderData *rd, bool preview, const char *suffix); /* optional */
+ void *(*context_create)(void);
+ void (*context_free)(void *context_v);
} bMovieHandle;
bMovieHandle *BKE_movie_handle_get(const char imtype);
- void BKE_movie_filepath_get(char *string, struct RenderData *rd, const char *suffix);
-void BKE_movie_filepath_get(char *string, struct RenderData *rd, bool preview);
++void BKE_movie_filepath_get(char *string, struct RenderData *rd, bool preview, const char *suffix);
+void BKE_context_create(bMovieHandle *mh);
#ifdef __cplusplus
}
diff --cc source/blender/blenkernel/BKE_writeffmpeg.h
index 4f4d5de,951fa50..a40c310
--- a/source/blender/blenkernel/BKE_writeffmpeg.h
+++ b/source/blender/blenkernel/BKE_writeffmpeg.h
@@@ -69,11 -68,11 +68,11 @@@ struct RenderData
struct ReportList;
struct Scene;
- int BKE_ffmpeg_start(void *context_v, struct Scene *scene, struct RenderData *rd, int rectx, int recty, const char *suffix, struct ReportList *reports);
-int BKE_ffmpeg_start(struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports, bool preview);
-void BKE_ffmpeg_end(void);
-int BKE_ffmpeg_append(struct RenderData *rd, int start_frame, int frame, int *pixels,
- int rectx, int recty, struct ReportList *reports);
-void BKE_ffmpeg_filepath_get(char *string, struct RenderData *rd, bool preview);
++int BKE_ffmpeg_start(void *context_v, struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports, bool preview, const char *suffix);
+void BKE_ffmpeg_end(void *context_v);
+int BKE_ffmpeg_append(void *context_v, struct RenderData *rd, int start_frame, int frame, int *pixels,
+ int rectx, int recty, const char *suffix, struct ReportList *reports);
- void BKE_ffmpeg_filepath_get(char *string, struct RenderData *rd, const char *suffix);
++void BKE_ffmpeg_filepath_get(char *string, struct RenderData *rd, bool preview, const char *suffix);
void BKE_ffmpeg_preset_set(struct RenderData *rd, int preset);
void BKE_ffmpeg_image_type_verify(struct RenderData *rd, struct ImageFormatData *imf);
diff --cc source/blender/blenkernel/BKE_writeframeserver.h
index ecca697,b7d601e..2f8bce3
--- a/source/blender/blenkernel/BKE_writeframeserver.h
+++ b/source/blender/blenkernel/BKE_writeframeserver.h
@@@ -40,13 -40,11 +40,14 @@@ struct RenderData
struct ReportList;
struct Scene;
- int BKE_frameserver_start(void *context_v, struct Scene *scene, struct RenderData *rd, int rectx, int recty, const char *suffix, struct ReportList *reports);
-int BKE_frameserver_start(struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports, bool preview);
-void BKE_frameserver_end(void);
-int BKE_frameserver_append(struct RenderData *rd, int start_frame, int frame, int *pixels,
- int rectx, int recty, struct ReportList *reports);
-int BKE_frameserver_loop(struct RenderData *rd, struct ReportList *reports);
++int BKE_frameserver_start(void *context_v, struct Scene *scene, struct RenderData *rd, int rectx, int recty,
++ struct ReportList *reports, bool preview, const char *suffix);
+void BKE_frameserver_end(void *context_v);
+int BKE_frameserver_append(void *context_v, struct RenderData *rd, int start_frame, int frame, int *pixels,
+ int rectx, int recty, const char*suffix, struct ReportList *reports);
+int BKE_frameserver_loop(void *context_v, struct RenderData *rd, struct ReportList *reports);
+void *BKE_frameserver_context_create(void);
+void BKE_frameserver_context_free(void *context_v);
#ifdef __cplusplus
}
diff --cc source/blender/blenkernel/intern/sequencer.c
index 5397f22,1e32c58..cc20525
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@@ -1410,30 -1330,12 +1410,43 @@@ static double seq_rendersize_to_scale_f
return 0.25;
}
-static void seq_open_anim_file(Editing *ed, Sequence *seq, bool openfile)
+/* the number of files will vary according to the stereo format */
+static size_t seq_num_files(Scene *scene, char views_format, const bool is_multiview)
+{
+ if (!is_multiview) {
+ return 1;
+ }
+ else if (views_format == R_IMF_VIEWS_STEREO_3D) {
+ return 1;
+ }
+ /* R_IMF_VIEWS_INDIVIDUAL */
+ else {
+ return BKE_scene_multiview_num_views_get(&scene->r);
+ }
+}
+
++static void seq_proxy_index_dir_set(struct anim *anim, const char *base_dir)
+ {
++ char dir[FILE_MAX];
++ char fname[FILE_MAXFILE];
++
++ IMB_anim_get_fname(anim, fname, FILE_MAXFILE);
++ BLI_strncpy(dir, base_dir, sizeof(dir));
++ BLI_path_append(dir, sizeof(dir), fname);
++ IMB_anim_set_index_dir(anim, dir);
++}
++
+static void seq_open_anim_file(Scene *scene, Sequence
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list