[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48096] branches/meshdata_transfer: svn merge ^/trunk/blender -r48011:48095
Ove Murberg Henriksen
sorayasilvermoon at hotmail.com
Tue Jun 19 21:38:00 CEST 2012
Revision: 48096
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48096
Author: cyborgmuppet
Date: 2012-06-19 19:37:59 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48011:48095
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48011
Modified Paths:
--------------
branches/meshdata_transfer/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/meshdata_transfer/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
branches/meshdata_transfer/intern/ffmpeg/ffmpeg_compat.h
branches/meshdata_transfer/release/scripts/startup/bl_operators/object_quick_effects.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_particle.py
branches/meshdata_transfer/source/blender/blenkernel/BKE_blender.h
branches/meshdata_transfer/source/blender/blenkernel/intern/CCGSubSurf.c
branches/meshdata_transfer/source/blender/blenkernel/intern/movieclip.c
branches/meshdata_transfer/source/blender/blenkernel/intern/paint.c
branches/meshdata_transfer/source/blender/blenkernel/intern/writeffmpeg.c
branches/meshdata_transfer/source/blender/blenloader/intern/readfile.c
branches/meshdata_transfer/source/blender/compositor/COM_defines.h
branches/meshdata_transfer/source/blender/compositor/intern/COM_NodeOperation.cpp
branches/meshdata_transfer/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/meshdata_transfer/source/blender/compositor/nodes/COM_DefocusNode.cpp
branches/meshdata_transfer/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
branches/meshdata_transfer/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/meshdata_transfer/source/blender/editors/CMakeLists.txt
branches/meshdata_transfer/source/blender/editors/SConscript
branches/meshdata_transfer/source/blender/editors/gpencil/gpencil_edit.c
branches/meshdata_transfer/source/blender/editors/include/ED_clip.h
branches/meshdata_transfer/source/blender/editors/mask/mask_add.c
branches/meshdata_transfer/source/blender/editors/mask/mask_draw.c
branches/meshdata_transfer/source/blender/editors/mask/mask_edit.c
branches/meshdata_transfer/source/blender/editors/mask/mask_intern.h
branches/meshdata_transfer/source/blender/editors/mask/mask_ops.c
branches/meshdata_transfer/source/blender/editors/mask/mask_select.c
branches/meshdata_transfer/source/blender/editors/object/object_edit.c
branches/meshdata_transfer/source/blender/editors/screen/screen_ops.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/meshdata_transfer/source/blender/editors/space_api/CMakeLists.txt
branches/meshdata_transfer/source/blender/editors/space_api/SConscript
branches/meshdata_transfer/source/blender/editors/space_api/spacetypes.c
branches/meshdata_transfer/source/blender/editors/space_buttons/space_buttons.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_dopesheet_ops.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_draw.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_editor.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_graph_draw.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_graph_ops.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_ops.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_utils.c
branches/meshdata_transfer/source/blender/editors/space_clip/space_clip.c
branches/meshdata_transfer/source/blender/editors/space_clip/tracking_ops.c
branches/meshdata_transfer/source/blender/editors/space_clip/tracking_select.c
branches/meshdata_transfer/source/blender/editors/space_file/file_draw.c
branches/meshdata_transfer/source/blender/editors/space_file/file_intern.h
branches/meshdata_transfer/source/blender/editors/space_file/file_ops.c
branches/meshdata_transfer/source/blender/editors/space_file/file_panels.c
branches/meshdata_transfer/source/blender/editors/space_file/filelist.c
branches/meshdata_transfer/source/blender/editors/space_file/filelist.h
branches/meshdata_transfer/source/blender/editors/space_file/filesel.c
branches/meshdata_transfer/source/blender/editors/space_file/fsmenu.c
branches/meshdata_transfer/source/blender/editors/space_file/fsmenu.h
branches/meshdata_transfer/source/blender/editors/space_file/space_file.c
branches/meshdata_transfer/source/blender/editors/space_node/drawnode.c
branches/meshdata_transfer/source/blender/editors/transform/transform.c
branches/meshdata_transfer/source/blender/editors/transform/transform_conversions.c
branches/meshdata_transfer/source/blender/editors/transform/transform_generics.c
branches/meshdata_transfer/source/blender/imbuf/intern/anim_movie.c
branches/meshdata_transfer/source/blender/imbuf/intern/indexer.c
branches/meshdata_transfer/source/blender/imbuf/intern/util.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_movieclip.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_nodetree.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_screen.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_space.c
branches/meshdata_transfer/source/blender/windowmanager/CMakeLists.txt
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_event_system.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_operators.c
branches/meshdata_transfer/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/meshdata_transfer/source/creator/CMakeLists.txt
branches/meshdata_transfer/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/meshdata_transfer/source/gameengine/VideoTexture/VideoFFmpeg.h
Added Paths:
-----------
branches/meshdata_transfer/source/blender/editors/io/
branches/meshdata_transfer/source/blender/editors/io/CMakeLists.txt
branches/meshdata_transfer/source/blender/editors/io/SConscript
branches/meshdata_transfer/source/blender/editors/io/io_collada.c
branches/meshdata_transfer/source/blender/editors/io/io_collada.h
branches/meshdata_transfer/source/blender/editors/io/io_ops.c
branches/meshdata_transfer/source/blender/editors/io/io_ops.h
Removed Paths:
-------------
branches/meshdata_transfer/source/blender/editors/io/CMakeLists.txt
branches/meshdata_transfer/source/blender/editors/io/SConscript
branches/meshdata_transfer/source/blender/editors/io/io_collada.c
branches/meshdata_transfer/source/blender/editors/io/io_collada.h
branches/meshdata_transfer/source/blender/editors/io/io_ops.c
branches/meshdata_transfer/source/blender/editors/io/io_ops.h
Property Changed:
----------------
branches/meshdata_transfer/
branches/meshdata_transfer/source/blender/editors/interface/interface.c
branches/meshdata_transfer/source/blender/editors/space_outliner/
Property changes on: branches/meshdata_transfer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-48011
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-48095
Modified: branches/meshdata_transfer/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- branches/meshdata_transfer/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2012-06-19 19:15:59 UTC (rev 48095)
+++ branches/meshdata_transfer/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2012-06-19 19:37:59 UTC (rev 48096)
@@ -143,23 +143,23 @@
switch(m_codecCtx->sample_fmt)
{
- case SAMPLE_FMT_U8:
+ case AV_SAMPLE_FMT_U8:
m_convert = AUD_convert_u8_float;
m_specs.format = AUD_FORMAT_U8;
break;
- case SAMPLE_FMT_S16:
+ case AV_SAMPLE_FMT_S16:
m_convert = AUD_convert_s16_float;
m_specs.format = AUD_FORMAT_S16;
break;
- case SAMPLE_FMT_S32:
+ case AV_SAMPLE_FMT_S32:
m_convert = AUD_convert_s32_float;
m_specs.format = AUD_FORMAT_S32;
break;
- case SAMPLE_FMT_FLT:
+ case AV_SAMPLE_FMT_FLT:
m_convert = AUD_convert_copy<float>;
m_specs.format = AUD_FORMAT_FLOAT32;
break;
- case SAMPLE_FMT_DBL:
+ case AV_SAMPLE_FMT_DBL:
m_convert = AUD_convert_double_float;
m_specs.format = AUD_FORMAT_FLOAT64;
break;
@@ -189,7 +189,7 @@
}
catch(AUD_Exception&)
{
- av_close_input_file(m_formatCtx);
+ avformat_close_input(&m_formatCtx);
throw;
}
}
@@ -227,7 +227,7 @@
}
catch(AUD_Exception&)
{
- av_close_input_stream(m_formatCtx);
+ avformat_close_input(&m_formatCtx);
av_free(m_aviocontext);
throw;
}
@@ -239,7 +239,7 @@
if(m_aviocontext)
{
- av_close_input_stream(m_formatCtx);
+ avformat_close_input(&m_formatCtx);
av_free(m_aviocontext);
}
else
Modified: branches/meshdata_transfer/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
===================================================================
--- branches/meshdata_transfer/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2012-06-19 19:15:59 UTC (rev 48095)
+++ branches/meshdata_transfer/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2012-06-19 19:37:59 UTC (rev 48096)
@@ -133,23 +133,23 @@
{
case AUD_FORMAT_U8:
m_convert = AUD_convert_float_u8;
- m_codecCtx->sample_fmt = SAMPLE_FMT_U8;
+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_U8;
break;
case AUD_FORMAT_S16:
m_convert = AUD_convert_float_s16;
- m_codecCtx->sample_fmt = SAMPLE_FMT_S16;
+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S16;
break;
case AUD_FORMAT_S32:
m_convert = AUD_convert_float_s32;
- m_codecCtx->sample_fmt = SAMPLE_FMT_S32;
+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_S32;
break;
case AUD_FORMAT_FLOAT32:
m_convert = AUD_convert_copy<float>;
- m_codecCtx->sample_fmt = SAMPLE_FMT_FLT;
+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_FLT;
break;
case AUD_FORMAT_FLOAT64:
m_convert = AUD_convert_float_double;
- m_codecCtx->sample_fmt = SAMPLE_FMT_DBL;
+ m_codecCtx->sample_fmt = AV_SAMPLE_FMT_DBL;
break;
default:
AUD_THROW(AUD_ERROR_FFMPEG, format_error);
Modified: branches/meshdata_transfer/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- branches/meshdata_transfer/intern/ffmpeg/ffmpeg_compat.h 2012-06-19 19:15:59 UTC (rev 48095)
+++ branches/meshdata_transfer/intern/ffmpeg/ffmpeg_compat.h 2012-06-19 19:37:59 UTC (rev 48096)
@@ -40,7 +40,6 @@
#endif
#include <libswscale/swscale.h>
-#include <libavcodec/opt.h>
#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 105))
#define FFMPEG_HAVE_AVIO 1
@@ -76,6 +75,20 @@
#define FFMPEG_FFV1_ALPHA_SUPPORTED
#endif
+#if ((LIBAVFORMAT_VERSION_MAJOR < 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 24)) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR < 24) && (LIBAVFORMAT_VERSION_MICRO < 2)))
+#define avformat_close_input(x) av_close_input_file(*(x))
+#endif
+
+#if ((LIBAVFORMAT_VERSION_MAJOR > 53) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR > 32)) || ((LIBAVFORMAT_VERSION_MAJOR == 53) && (LIBAVFORMAT_VERSION_MINOR == 24) && (LIBAVFORMAT_VERSION_MICRO >= 100)))
+void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp);
+
+static inline
+void av_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp)
+{
+ ff_update_cur_dts(s, ref_st, timestamp);
+}
+#endif
+
#ifndef FFMPEG_HAVE_AVIO
#define AVIO_FLAG_WRITE URL_WRONLY
#define avio_open url_fopen
Modified: branches/meshdata_transfer/release/scripts/startup/bl_operators/object_quick_effects.py
===================================================================
--- branches/meshdata_transfer/release/scripts/startup/bl_operators/object_quick_effects.py 2012-06-19 19:15:59 UTC (rev 48095)
+++ branches/meshdata_transfer/release/scripts/startup/bl_operators/object_quick_effects.py 2012-06-19 19:37:59 UTC (rev 48096)
@@ -174,6 +174,7 @@
if self.style == 'BLEND' and len(mesh_objects) != 2:
self.report({'ERROR'}, "Select two mesh objects")
+ self.style = 'EXPLODE'
return {'CANCELLED'}
elif not mesh_objects:
self.report({'ERROR'}, "Select at least one mesh object")
@@ -241,10 +242,10 @@
if obj == to_obj:
tex_slot.alpha_factor = -1.0
elem = tex.color_ramp.elements[1]
- elem.color = mat.diffuse_color
else:
elem = tex.color_ramp.elements[0]
- elem.color = mat.diffuse_color
+ # Keep already defined alpha!
+ elem.color[:3] = mat.diffuse_color
else:
tex_slot.use_map_color_diffuse = False
Modified: branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_particle.py
===================================================================
--- branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_particle.py 2012-06-19 19:15:59 UTC (rev 48095)
+++ branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_particle.py 2012-06-19 19:37:59 UTC (rev 48096)
@@ -841,7 +841,7 @@
row = layout.row()
row.prop(part, "use_simplify_viewport")
sub = row.row()
- sub.active = part.viewport == True
+ sub.active = part.use_simplify_viewport == True
sub.prop(part, "simplify_viewport")
elif part.render_type == 'OBJECT':
Modified: branches/meshdata_transfer/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/meshdata_transfer/source/blender/blenkernel/BKE_blender.h 2012-06-19 19:15:59 UTC (rev 48095)
+++ branches/meshdata_transfer/source/blender/blenkernel/BKE_blender.h 2012-06-19 19:37:59 UTC (rev 48096)
@@ -42,7 +42,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 263
-#define BLENDER_SUBVERSION 11
+#define BLENDER_SUBVERSION 12
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: branches/meshdata_transfer/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- branches/meshdata_transfer/source/blender/blenkernel/intern/CCGSubSurf.c 2012-06-19 19:15:59 UTC (rev 48095)
+++ branches/meshdata_transfer/source/blender/blenkernel/intern/CCGSubSurf.c 2012-06-19 19:37:59 UTC (rev 48096)
@@ -1627,7 +1627,7 @@
int nextLvl = curLvl + 1;
int ptrIdx, cornerIdx, i;
int vertDataSize = ss->meshIFC.vertDataSize;
- void *q = ss->q, *r = ss->r;
+ float *q = ss->q, *r = ss->r;
#pragma omp parallel for private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT)
for (ptrIdx = 0; ptrIdx < numEffectedF; ptrIdx++) {
@@ -1642,11 +1642,11 @@
for (x = 0; x < gridSize - 1; x++) {
int fx = 1 + 2 * x;
int fy = 1 + 2 * y;
- void *co0 = FACE_getIFCo(f, curLvl, S, x + 0, y + 0);
- void *co1 = FACE_getIFCo(f, curLvl, S, x + 1, y + 0);
- void *co2 = FACE_getIFCo(f, curLvl, S, x + 1, y + 1);
- void *co3 = FACE_getIFCo(f, curLvl, S, x + 0, y + 1);
- void *co = FACE_getIFCo(f, nextLvl, S, fx, fy);
+ const float *co0 = FACE_getIFCo(f, curLvl, S, x + 0, y + 0);
+ const float *co1 = FACE_getIFCo(f, curLvl, S, x + 1, y + 0);
+ const float *co2 = FACE_getIFCo(f, curLvl, S, x + 1, y + 1);
+ const float *co3 = FACE_getIFCo(f, curLvl, S, x + 0, y + 1);
+ float *co = FACE_getIFCo(f, nextLvl, S, fx, fy);
VertDataAvg4(co, co0, co1, co2, co3, ss);
}
@@ -1660,11 +1660,11 @@
for (S = 0; S < f->numVerts; S++) {
for (x = 0; x < gridSize - 1; x++) {
int fx = x * 2 + 1;
- void *co0 = FACE_getIECo(f, curLvl, S, x + 0);
- void *co1 = FACE_getIECo(f, curLvl, S, x + 1);
- void *co2 = FACE_getIFCo(f, nextLvl, (S + 1) % f->numVerts, 1, fx);
- void *co3 = FACE_getIFCo(f, nextLvl, S, fx, 1);
- void *co = FACE_getIECo(f, nextLvl, S, fx);
+ const float *co0 = FACE_getIECo(f, curLvl, S, x + 0);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list