Commit: 4338e1298ff9443de7e0519fe42a1c27bb2ae075
Author: Campbell Barton
Date: Sat Jan 24 19:00:29 2015 +1100
Branches: multiview
https://developer.blender.org/rB4338e1298ff9443de7e0519fe42a1c27bb2ae075
Merge branch 'master' into multiview
Conflicts:
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/ocean.c
source/blender/blenkernel/intern/writeavi.c
source/blender/compositor/operations/COM_OutputFileOperation.cpp
source/blender/editors/object/object_bake_api.c
source/blender/editors/render/render_opengl.c
source/blender/editors/screen/screendump.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/render/intern/source/pipeline.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_image.h
index bd9563e,5ee8ae2..475fddc
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@@ -60,20 -57,25 +60,22 @@@ void BKE_image_free_buffers(struct I
void BKE_image_free(struct Image *image);
void BKE_imbuf_stamp_info(struct Scene *scene, struct Object *camera,
struct ImBuf *ibuf);
- void BKE_stamp_buf(struct Scene *scene, struct Object *camera, unsigned
char *rect, float *rectf, int width, int height, int channels);
-void BKE_image_stamp_buf(
- struct Scene *scene, struct Object *camera,
- unsigned char *rect, float *rectf, int width, int height, int
channels);
++void BKE_image_stamp_buf(struct Scene *scene, struct Object *camera,
unsigned char *rect, float *rectf, int width, int height, int channels);
bool BKE_imbuf_alpha_test(struct ImBuf *ibuf);
int BKE_imbuf_write_stamp(struct Scene *scene, struct Object *camera,
struct ImBuf *ibuf, const char *name, struct ImageFormatData *imf);
+void BKE_imbuf_write_prepare(struct ImBuf *ibuf, struct ImageFormatData
*imf);
int BKE_imbuf_write(struct ImBuf *ibuf, const char *name, struct
ImageFormatData *imf);
int BKE_imbuf_write_as(struct ImBuf *ibuf, const char *name, struct
ImageFormatData *imf, const bool is_copy);
- void BKE_makepicstring(char *string, const char *base, const char
*relbase, int frame,
- const struct ImageFormatData *im_format, const bool
use_ext, const bool use_frames, const char *view);
- void BKE_makepicstring_from_type(char *string, const char *base, const
char *relbase, int frame,
- const char imtype, const bool use_ext,
const bool use_frames, const char *view);
- int BKE_add_image_extension(char *string, const struct ImageFormatData
*im_format);
- int BKE_add_image_extension_from_type(char *string, const char imtype);
- char BKE_ftype_to_imtype(const int ftype);
- int BKE_imtype_to_ftype(const char imtype);
-
+ void BKE_image_path_from_imformat(
+ char *string, const char *base, const char *relbase, int frame,
- const struct ImageFormatData *im_format, const bool use_ext, const
bool use_frames);
++ const struct ImageFormatData *im_format, const bool use_ext, const
bool use_frames, const char *view);
+ void BKE_image_path_from_imtype(
+ char *string, const char *base, const char *relbase, int frame,
- const char imtype, const bool use_ext, const bool use_frames);
-
-bool BKE_image_path_ensure_ext_from_imformat(char *string, const struct
ImageFormatData *im_format);
-bool BKE_image_path_ensure_ext_from_imtype(char *string, const char
imtype);
++ const char imtype, const bool use_ext, const bool use_frames, const
char *view);
++int BKE_image_path_ensure_ext_from_imformat(char *string, const struct
ImageFormatData *im_format);
++int BKE_image_path_ensure_ext_from_imtype(char *string, const char
imtype);
+ char BKE_image_ftype_to_imtype(const int ftype);
+ int BKE_image_imtype_to_ftype(const char imtype);
bool BKE_imtype_is_movie(const char imtype);
int BKE_imtype_supports_zbuf(const char imtype);
diff --cc source/blender/blenkernel/intern/image.c
index 7e36c0b,2716504..294b65a
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@@ -1535,14 -1368,14 +1535,14 @@@ static bool do_add_image_extension(cha
}
}
- int BKE_add_image_extension(char *string, const ImageFormatData *im_format)
-bool BKE_image_path_ensure_ext_from_imformat(char *string, const
ImageFormatData *im_format)
++int BKE_image_path_ensure_ext_from_imformat(char *string, const
ImageFormatData *im_format)
{
- return image_path_ensure_ext(string, im_format->imtype, im_format);
+ return do_add_image_extension(string, im_format->imtype, im_format);
}
- int BKE_add_image_extension_from_type(char *string, const char imtype)
-bool BKE_image_path_ensure_ext_from_imtype(char *string, const char imtype)
++int BKE_image_path_ensure_ext_from_imtype(char *string, const char imtype)
{
- return image_path_ensure_ext(string, imtype, NULL);
+ return do_add_image_extension(string, imtype, NULL);
}
void BKE_imformat_defaults(ImageFormatData *im_format)
@@@ -1818,7 -1651,9 +1818,7 @@@ static void stampdata(Scene *scene, Obj
}
}
- void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float
*rectf, int width, int height, int channels)
-void BKE_image_stamp_buf(
- Scene *scene, Object *camera,
- unsigned char *rect, float *rectf, int width, int height, int
channels)
++void BKE_image_stamp_buf(Scene *scene, Object *camera, unsigned char *rect,
float *rectf, int width, int height, int channels)
{
struct StampData stamp_data;
float w, h, pad;
@@@ -2258,22 -2089,22 +2258,24 @@@ static void do_makepicstring(char *stri
if (use_frames)
BLI_path_frame(string, frame, 4);
+ BLI_path_view(string, view);
+
if (use_ext)
- image_path_ensure_ext(string, imtype, im_format);
+ do_add_image_extension(string, imtype, im_format);
}
- void BKE_makepicstring(char *string, const char *base, const char *relbase,
int frame,
- const ImageFormatData *im_format, const bool use_ext,
const bool use_frames, const char *view)
+ void BKE_image_path_from_imformat(
+ char *string, const char *base, const char *relbase, int frame,
- const ImageFormatData *im_format, const bool use_ext, const bool
use_frames)
++ const ImageFormatData *im_format, const bool use_ext, const bool
use_frames, const char *view)
{
- image_path_makepicstring(string, base, relbase, frame,
im_format->imtype, im_format, use_ext, use_frames);
+ do_makepicstring(string, base, relbase, frame, im_format->imtype,
im_format, use_ext, use_frames, view);
}
- void BKE_makepicstring_from_type(char *string, const char *base, const char
*relbase, int frame,
- const char imtype, const bool use_ext, const
bool use_frames, const char *view)
+ void BKE_image_path_from_imtype(
+ char *string, const char *base, const char *relbase, int frame,
- const char imtype, const bool use_ext, const bool use_frames)
++ const char imtype, const bool use_ext, const bool use_frames, const
char *view)
{
- image_path_makepicstring(string, base, relbase, frame, imtype, NULL,
use_ext, use_frames);
+ do_makepicstring(string, base, relbase, frame, imtype, NULL, use_ext,
use_frames, view);
}
/* used by sequencer too */
diff --cc source/blender/blenkernel/intern/ocean.c
index 7a58ab4,12e82d3..7a9eeb7
--- a/source/blender/blenkernel/intern/ocean.c
+++ b/source/blender/blenkernel/intern/ocean.c
@@@ -1002,7 -1002,7 +1002,7 @@@ static void cache_filename(char *string
BLI_join_dirfile(cachepath, sizeof(cachepath), path, fname);
- BKE_makepicstring_from_type(string, cachepath, relbase, frame,
R_IMF_IMTYPE_OPENEXR, true, true, "");
- BKE_image_path_from_imtype(string, cachepath, relbase, frame,
R_IMF_IMTYPE_OPENEXR, true, true);
++ BKE_image_path_from_imtype(string, cachepath, relbase, frame,
R_IMF_IMTYPE_OPENEXR, true, true, "");
}
/* silly functions but useful to inline when the args do a lot of
indirections */
diff --cc source/blender/blenkernel/intern/writeavi.c
index c90367d,85eac1f..8fb01d9
--- a/source/blender/blenkernel/intern/writeavi.c
+++ b/source/blender/blenkernel/intern/writeavi.c
@@@ -266,26 -248,13 +266,26 @@@ static void end_avi(void *context_v
if (avi == NULL) return;
AVI_close_compress(avi);
- MEM_freeN(avi);
- avi = NULL;
}
+
+static void *context_create_avi(void)
+{
+ AviMovie *avi = MEM_mallocN(sizeof(AviMovie), "avimovie");
+ return avi;
+}
+
+static void context_free_avi(void *context_v)
+{
+ AviMovie *avi = context_v;
+ if (avi) {
+ MEM_freeN(avi);
+ }
+}
+
#endif /* WITH_AVI */
- /* similar to BKE_makepicstring() */
+ /* similar to BKE_image_path_from_imformat() */
-void BKE_movie_filepath_get(char *string, RenderData *rd)
+void BKE_movie_filepath_get(char *string, RenderData *rd, const char *suffix)
{
bMovieHandle *mh = BKE_movie_handle_get(rd->im_format.imtype);
if (mh->get_movie_path)
diff --cc
source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
index ae24472,0000000..060e84a
mode 100644,000000..100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
@@@ -1,314 -1,0 +1,317 @@@
+/*
+ * Copyright 2013, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor:
+ * Jeroen Bakker
+ * Monique Dewanchand
+ * Lukas Tönne
+ * Dalai Felinto
+ */
+
+#include "COM_OutputFileOperation.h"
+#include "COM_OutputFileMultiViewOperation.h"
+
+#include <string.h>
+#include "BLI_listbase.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"
+#include "BKE_image.h"
+#include "BKE_global.h"
+#include "BKE_main.h"
+#include "BKE_scene.h"
+
+#include "DNA_color_types.h"
+#include "MEM_guardedalloc.h"
+
+extern "C" {
+#include "IMB_imbuf.h"
+#include "IMB_colormanagement.h"
+#include "IMB_imbuf_types.h"
+}
+
+/************************************ OpenEXR Singlelayer Multiview
*****************************************/
+
+OutputOpenExrSingleLayerMultiViewOperation::OutputOpenExrSingleLayerMultiViewOperation(
+
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
