Revision: 41709
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41709
Author: campbellbarton
Date: 2011-11-10 01:50:22 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
svn merge -r41638:41648 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41638
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
branches/bmesh/blender/source/blender/editors/armature/reeb.c
branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_node/node_header.c
branches/bmesh/blender/source/blender/editors/space_node/node_templates.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
branches/bmesh/blender/source/blender/imbuf/intern/anim_movie.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_movieclip.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_tracking.c
branches/bmesh/blender/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/bmesh/blender/source/blender/render/intern/source/occlusion.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41638
+ /trunk/blender:39992-41648
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-41638
+ /trunk/blender/release:31524-41648
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
2011-11-09 19:25:16 UTC (rev 41708)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/movieclip.c
2011-11-10 01:50:22 UTC (rev 41709)
@@ -191,15 +191,13 @@
{
struct ImBuf *ibuf;
char name[FILE_MAX];
- int loadflag /*, size */ /* UNUSED */, undistort;
+ int loadflag, use_proxy= 0;
- /* size= rendersize_to_number(user->render_size); */
-
- undistort= user->render_flag&MCLIP_PROXY_RENDER_UNDISTORT;
-
- if((flag&MCLIP_USE_PROXY) && user->render_size !=
MCLIP_PROXY_RENDER_SIZE_FULL)
+ use_proxy= (flag&MCLIP_USE_PROXY) && user->render_size !=
MCLIP_PROXY_RENDER_SIZE_FULL;
+ if(use_proxy) {
+ int undistort= user->render_flag&MCLIP_PROXY_RENDER_UNDISTORT;
get_proxy_fname(clip, user->render_size, undistort, framenr,
name);
- else
+ } else
get_sequence_fname(clip, framenr, name);
loadflag= IB_rect|IB_multilayer;
@@ -318,7 +316,7 @@
if(clip->cache) {
MovieClipImBufCacheKey key;
- key.framenr= user?user->framenr:clip->lastframe;
+ key.framenr= user->framenr;
if(flag&MCLIP_USE_PROXY) {
key.proxy= rendersize_to_proxy(user, flag);
@@ -346,7 +344,7 @@
moviecache_hashcmp, moviecache_keydata);
}
- key.framenr= user?user->framenr:clip->lastframe;
+ key.framenr= user->framenr;
if(flag&MCLIP_USE_PROXY) {
key.proxy= rendersize_to_proxy(user, flag);
@@ -478,9 +476,6 @@
static int need_undistorted_cache(MovieClipUser *user, int flag)
{
- if (!user)
- return 0;
-
/* only full undistorted render can be used as on-fly undistorting
image */
if(flag&MCLIP_USE_PROXY) {
if(user->render_size != MCLIP_PROXY_RENDER_SIZE_FULL ||
(user->render_flag&MCLIP_PROXY_RENDER_UNDISTORT)==0)
@@ -495,7 +490,7 @@
{
MovieClipCache *cache= clip->cache;
MovieTrackingCamera *camera= &clip->tracking.camera;
- int framenr= user?user->framenr:clip->lastframe;
+ int framenr= user->framenr;
/* no cache or no cached undistorted image */
if(!clip->cache || !clip->cache->undistibuf)
@@ -530,7 +525,7 @@
else
undistibuf= BKE_tracking_undistort(&clip->tracking, ibuf,
ibuf->x, ibuf->y, 0.0f);
- if(undistibuf->userflags|= IB_RECT_INVALID) {
+ if(undistibuf->userflags&IB_RECT_INVALID) {
ibuf->userflags&= ~IB_RECT_INVALID;
IMB_rect_from_float(undistibuf);
}
@@ -547,7 +542,7 @@
copy_v2_v2(cache->principal, camera->principal);
copy_v3_v3(&cache->k1, &camera->k1);
- cache->undist_framenr= user?user->framenr:clip->lastframe;
+ cache->undist_framenr= user->framenr;
if(cache->undistibuf)
IMB_freeImBuf(cache->undistibuf);
@@ -568,7 +563,7 @@
ImBuf *BKE_movieclip_get_ibuf(MovieClip *clip, MovieClipUser *user)
{
ImBuf *ibuf= NULL;
- int framenr= user?user->framenr:clip->lastframe;
+ int framenr= user->framenr;
int cache_undistorted= 0;
/* cache isn't threadsafe itself and also loading of movies
@@ -586,11 +581,11 @@
ibuf= get_imbuf_cache(clip, user, clip->flag);
if(!ibuf) {
- int use_sequence= 1;
+ int use_sequence= 0;
/* undistorted proxies for movies should be read as image
sequence */
- use_sequence&= user->render_flag&MCLIP_PROXY_RENDER_UNDISTORT;
- use_sequence&= user->render_size!=MCLIP_PROXY_RENDER_SIZE_FULL;
+ use_sequence= (user->render_flag&MCLIP_PROXY_RENDER_UNDISTORT)
&&
+ (user->render_size!=MCLIP_PROXY_RENDER_SIZE_FULL);
if(clip->source==MCLIP_SRC_SEQUENCE || use_sequence)
ibuf= movieclip_load_sequence_file(clip, user, framenr,
clip->flag);
@@ -622,7 +617,7 @@
ImBuf *BKE_movieclip_get_ibuf_flag(MovieClip *clip, MovieClipUser *user, int
flag)
{
ImBuf *ibuf= NULL;
- int framenr= user?user->framenr:clip->lastframe;
+ int framenr= user->framenr;
int cache_undistorted= 0;
/* cache isn't threadsafe itself and also loading of movies
@@ -668,7 +663,7 @@
ImBuf *BKE_movieclip_get_stable_ibuf(MovieClip *clip, MovieClipUser *user,
float loc[2], float *scale, float *angle)
{
ImBuf *ibuf, *stableibuf= NULL;
- int framenr= user?user->framenr:clip->lastframe;
+ int framenr= user->framenr;
ibuf= BKE_movieclip_get_ibuf(clip, user);
@@ -749,7 +744,7 @@
void BKE_movieclip_get_size(MovieClip *clip, MovieClipUser *user, int *width,
int *height)
{
- if(!user || user->framenr==clip->lastframe) {
+ if(user->framenr==clip->lastframe) {
*width= clip->lastsize[0];
*height= clip->lastsize[1];
} else {
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
2011-11-09 19:25:16 UTC (rev 41708)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
2011-11-10 01:50:22 UTC (rev 41709)
@@ -3177,7 +3177,7 @@
mul_v3_fl(v1_tan, 1.0f - 0.01f * frict);
/* surface_velocity is opposite to cm velocity
*/
- mul_v3_v3fl(vr_tan, v1_tan, -1.0f);
+ negate_v3_v3(vr_tan, v1_tan);
/* get back to global coordinates */
add_v3_v3(v1_tan, vc_tan);
Modified: branches/bmesh/blender/source/blender/editors/armature/reeb.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/armature/reeb.c
2011-11-09 19:25:16 UTC (rev 41708)
+++ branches/bmesh/blender/source/blender/editors/armature/reeb.c
2011-11-10 01:50:22 UTC (rev 41709)
@@ -3695,7 +3695,7 @@
if (G.scene->toolsettings->skgen_options & SKGEN_DISP_INDEX)
{
- interp_v3_v3v3(vec, arc->head->p, arc->tail->p, 0.5f);
+ mid_v3_v3v3(vec, arc->head->p, arc->tail->p);
s += sprintf(s, "%i (%i-%i-%i) ", i,
arc->symmetry_level, arc->symmetry_flag, arc->symmetry_group);
if (G.scene->toolsettings->skgen_options &
SKGEN_DISP_WEIGHT)
Modified:
branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
2011-11-09 19:25:16 UTC (rev 41708)
+++ branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
2011-11-10 01:50:22 UTC (rev 41709)
@@ -1537,7 +1537,7 @@
}
/* could fail if footage uses images with different sizes */
- BKE_movieclip_get_size(clip, NULL, &width, &height);
+ BKE_movieclip_get_size(clip, &sc->user, &width, &height);
error= BKE_tracking_solve_reconstruction(tracking, width, height);
@@ -1546,6 +1546,9 @@
else
BKE_reportf(op->reports, RPT_INFO, "Average reprojection error
%.3f", error);
+ if(scene->clip)
+ id_us_min(&clip->id);
+
scene->clip= clip;
id_us_plus(&clip->id);
Modified: branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
2011-11-09 19:25:16 UTC (rev 41708)
+++ branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
2011-11-10 01:50:22 UTC (rev 41709)
@@ -2211,9 +2211,7 @@
node->id = &scene->id;
}
else if(ELEM3(node->type, CMP_NODE_MOVIECLIP,
CMP_NODE_MOVIEDISTORTION, CMP_NODE_STABILIZE2D)) {
- if(G.main->movieclip.first ==
G.main->movieclip.last) {
- node->id= G.main->movieclip.first;
- }
+ node->id = (ID *)scene->clip;
}
ntreeCompositForceHidden(snode->edittree, scene);
Modified: branches/bmesh/blender/source/blender/editors/space_node/node_header.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_node/node_header.c
2011-11-09 19:25:16 UTC (rev 41708)
+++ branches/bmesh/blender/source/blender/editors/space_node/node_header.c
2011-11-10 01:50:22 UTC (rev 41709)
@@ -229,7 +229,7 @@
static void node_menu_add_foreach_cb(void *calldata, int nclass, const char
*name)
{
uiLayout *layout= calldata;
- uiItemMenuF(layout, IFACE_(name), 0, node_add_menu,
SET_INT_IN_POINTER(nclass));
+ uiItemMenuF(layout, name, 0, node_add_menu, SET_INT_IN_POINTER(nclass));
}
static void node_menu_add(const bContext *C, Menu *menu)
Modified:
branches/bmesh/blender/source/blender/editors/space_node/node_templates.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_node/node_templates.c
2011-11-09 19:25:16 UTC (rev 41708)
+++ branches/bmesh/blender/source/blender/editors/space_node/node_templates.c
2011-11-10 01:50:22 UTC (rev 41709)
@@ -432,7 +432,7 @@
NodeLinkArg *arg = (NodeLinkArg*)calldata;
if(!ELEM(nclass, NODE_CLASS_GROUP, NODE_CLASS_LAYOUT))
- ui_node_menu_column(arg, nclass, IFACE_(name));
+ ui_node_menu_column(arg, nclass, name);
}
static void ui_template_node_link_menu(bContext *C, uiLayout *layout, void
*but_p)
Property changes on:
branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-41638
+ /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-41648
Modified:
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
2011-11-09 19:25:16 UTC (rev 41708)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
2011-11-10 01:50:22 UTC (rev 41709)
@@ -2624,7 +2624,7 @@
copy_v3_v3(v1, eed->v1->co);
copy_v3_v3(v2, eed->v2->co);
- interp_v3_v3v3(vmid, v1, v2, 0.5f);
+ mid_v3_v3v3(vmid, v1, v2);
if(do_global) {
mul_mat3_m4_v3(ob->obmat, v1);
Modified:
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
