[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43832] branches/bmesh/blender: svn merge ^/trunk/blender -r43819:43830
Campbell Barton
ideasman42 at gmail.com
Thu Feb 2 01:04:54 CET 2012
Revision: 43832
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43832
Author: campbellbarton
Date: 2012-02-02 00:04:47 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43819:43830
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43819
Modified Paths:
--------------
branches/bmesh/blender/intern/cycles/blender/addon/ui.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
branches/bmesh/blender/source/blender/blenkernel/BKE_movieclip.h
branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/object/object_bake.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_ops.c
branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl
branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/bmesh/blender/source/blender/makesdna/DNA_movieclip_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_fluidsim.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_fluidsim.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_movieclip.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /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
/trunk/blender:39992-43819
+ /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
/trunk/blender:39992-43830
Modified: branches/bmesh/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2012-02-01 23:22:55 UTC (rev 43831)
+++ branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2012-02-02 00:04:47 UTC (rev 43832)
@@ -606,6 +606,7 @@
col = split.column()
col.prop(cmat, "sample_as_light")
+ col.prop(mat, "pass_index")
class CyclesTexture_PT_context(CyclesButtonsPanel, Panel):
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43819
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43830
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py 2012-02-01 23:22:55 UTC (rev 43831)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py 2012-02-02 00:04:47 UTC (rev 43832)
@@ -85,6 +85,7 @@
col.label()
col.prop(fluid, "use_speed_vectors")
col.prop(fluid, "use_reverse_frames")
+ col.prop(fluid, "frame_offset", text="Offset")
layout.prop(fluid, "filepath", text="")
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2012-02-01 23:22:55 UTC (rev 43831)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2012-02-02 00:04:47 UTC (rev 43832)
@@ -720,17 +720,21 @@
layout.active = clip.use_proxy
- layout.label(text="Build Sizes:")
+ layout.label(text="Build Original:")
- row = layout.row()
- row.prop(clip.proxy, "build_25")
- row.prop(clip.proxy, "build_50")
+ row = layout.row(align=True)
+ row.prop(clip.proxy, "build_25", toggle=True)
+ row.prop(clip.proxy, "build_50", toggle=True)
+ row.prop(clip.proxy, "build_75", toggle=True)
+ row.prop(clip.proxy, "build_100", toggle=True)
- row = layout.row()
- row.prop(clip.proxy, "build_75")
- row.prop(clip.proxy, "build_100")
+ layout.label(text="Build Undistorted:")
- layout.prop(clip.proxy, "build_undistorted")
+ row = layout.row(align=True)
+ row.prop(clip.proxy, "build_undistorted_25", toggle=True)
+ row.prop(clip.proxy, "build_undistorted_50", toggle=True)
+ row.prop(clip.proxy, "build_undistorted_75", toggle=True)
+ row.prop(clip.proxy, "build_undistorted_100", toggle=True)
layout.prop(clip.proxy, "quality")
@@ -738,7 +742,7 @@
if clip.use_proxy_custom_directory:
layout.prop(clip.proxy, "directory")
- layout.operator("clip.rebuild_proxy", text="Rebuild Proxy")
+ layout.operator("clip.rebuild_proxy", text="Build Proxy")
if clip.source == 'MOVIE':
col = layout.column()
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_movieclip.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_movieclip.h 2012-02-01 23:22:55 UTC (rev 43831)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_movieclip.h 2012-02-02 00:04:47 UTC (rev 43832)
@@ -49,7 +49,7 @@
struct ImBuf *BKE_movieclip_get_ibuf(struct MovieClip *clip, struct MovieClipUser *user);
struct ImBuf *BKE_movieclip_get_postprocessed_ibuf(struct MovieClip *clip, struct MovieClipUser *user, int postprocess_flag);
struct ImBuf *BKE_movieclip_get_stable_ibuf(struct MovieClip *clip, struct MovieClipUser *user, float loc[2], float *scale, float *angle, int postprocess_flag);
-struct ImBuf *BKE_movieclip_get_ibuf_flag(struct MovieClip *clip, struct MovieClipUser *user, int flag);
+struct ImBuf *BKE_movieclip_get_ibuf_flag(struct MovieClip *clip, struct MovieClipUser *user, int flag, int cache_flag);
void BKE_movieclip_get_size(struct MovieClip *clip, struct MovieClipUser *user, int *width, int *height);
void BKE_movieclip_aspect(struct MovieClip *clip, float *aspx, float *aspy);
int BKE_movieclip_has_frame(struct MovieClip *clip, struct MovieClipUser *user);
@@ -64,6 +64,9 @@
void BKE_movieclip_build_proxy_frame(struct MovieClip *clip, int clip_flag, struct MovieDistortion *distortion,
int cfra, int *build_sizes, int build_count, int undistorted);
+/* cacheing flags */
+#define MOVIECLIP_CACHE_SKIP (1<<0)
+
/* postprocessing flags */
#define MOVIECLIP_DISABLE_RED (1<<0)
#define MOVIECLIP_DISABLE_GREEN (1<<1)
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c 2012-02-01 23:22:55 UTC (rev 43831)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c 2012-02-02 00:04:47 UTC (rev 43832)
@@ -631,7 +631,8 @@
return postproc_ibuf;
}
-static ImBuf *movieclip_get_postprocessed_ibuf(MovieClip *clip, MovieClipUser *user, int flag, int postprocess_flag)
+static ImBuf *movieclip_get_postprocessed_ibuf(MovieClip *clip, MovieClipUser *user, int flag,
+ int postprocess_flag, int cache_flag)
{
ImBuf *ibuf= NULL;
int framenr= user->framenr, need_postprocess= 0;
@@ -664,7 +665,7 @@
ibuf= movieclip_load_movie_file(clip, user, framenr, flag);
}
- if(ibuf)
+ if(ibuf && (cache_flag & MOVIECLIP_CACHE_SKIP) == 0)
put_imbuf_cache(clip, user, ibuf, flag);
}
@@ -687,17 +688,17 @@
ImBuf *BKE_movieclip_get_ibuf(MovieClip *clip, MovieClipUser *user)
{
- return BKE_movieclip_get_ibuf_flag(clip, user, clip->flag);
+ return BKE_movieclip_get_ibuf_flag(clip, user, clip->flag, 0);
}
-ImBuf *BKE_movieclip_get_ibuf_flag(MovieClip *clip, MovieClipUser *user, int flag)
+ImBuf *BKE_movieclip_get_ibuf_flag(MovieClip *clip, MovieClipUser *user, int flag, int cache_flag)
{
- return movieclip_get_postprocessed_ibuf(clip, user, flag, 0);
+ return movieclip_get_postprocessed_ibuf(clip, user, flag, 0, cache_flag);
}
ImBuf *BKE_movieclip_get_postprocessed_ibuf(MovieClip *clip, MovieClipUser *user, int postprocess_flag)
{
- return movieclip_get_postprocessed_ibuf(clip, user, clip->flag, postprocess_flag);
+ return movieclip_get_postprocessed_ibuf(clip, user, clip->flag, postprocess_flag, 0);
}
static ImBuf *get_stable_cached_frame(MovieClip *clip, MovieClipUser *user, int framenr)
@@ -1021,7 +1022,7 @@
user.render_flag= 0;
user.render_size= MCLIP_PROXY_RENDER_SIZE_FULL;
- ibuf= BKE_movieclip_get_ibuf_flag(clip, &user, clip_flag);
+ ibuf= BKE_movieclip_get_ibuf_flag(clip, &user, clip_flag, MOVIECLIP_CACHE_SKIP);
if(ibuf) {
ImBuf *tmpibuf= ibuf;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c 2012-02-01 23:22:55 UTC (rev 43831)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c 2012-02-02 00:04:47 UTC (rev 43832)
@@ -975,8 +975,8 @@
context->clip_flag= clip->flag&MCLIP_TIMECODE_FLAGS;
context->user= *user;
- context->user.render_size= 0;
- context->user.render_flag= MCLIP_PROXY_RENDER_SIZE_FULL;
+ context->user.render_size= MCLIP_PROXY_RENDER_SIZE_FULL;
+ context->user.render_flag= 0;
if(!sequence)
BLI_begin_threaded_malloc();
@@ -1226,7 +1226,7 @@
user.framenr= framenr;
- ibuf= BKE_movieclip_get_ibuf_flag(context->clip, &user, context->clip_flag);
+ ibuf= BKE_movieclip_get_ibuf_flag(context->clip, &user, context->clip_flag, MOVIECLIP_CACHE_SKIP);
return ibuf;
}
@@ -1330,7 +1330,7 @@
if(context->backwards) context->user.framenr--;
else context->user.framenr++;
- ibuf_new= BKE_movieclip_get_ibuf_flag(context->clip, &context->user, context->clip_flag);
+ ibuf_new= BKE_movieclip_get_ibuf_flag(context->clip, &context->user, context->clip_flag, MOVIECLIP_CACHE_SKIP);
if(!ibuf_new)
return 0;
Modified: branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c 2012-02-01 23:22:55 UTC (rev 43831)
+++ branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c 2012-02-02 00:04:47 UTC (rev 43832)
@@ -310,7 +310,7 @@
layernum = CustomData_number_of_layers(&em->bm->pdata, CD_MTEXPOLY);
if (layernum >= MAX_MTFACE)
- return 0;
+ return -1;
BM_add_data_layer(em->bm, &em->bm->pdata, CD_MTEXPOLY);
CustomData_set_layer_active(&em->bm->pdata, CD_MTEXPOLY, layernum);
@@ -335,7 +335,7 @@
else {
layernum = CustomData_number_of_layers(&me->pdata, CD_MTEXPOLY);
if (layernum >= MAX_MTFACE)
- return 0;
+ return -1;
if (me->mtpoly) {
CustomData_add_layer_named(&me->pdata, CD_MTEXPOLY, CD_DUPLICATE, me->mtpoly, me->totpoly, name);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list