[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29627] branches/render25: svn merge https ://svn.blender.org/svnroot/bf-blender/trunk/blender -r29614:29626
Brecht Van Lommel
brecht at blender.org
Tue Jun 22 20:36:30 CEST 2010
Revision: 29627
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29627
Author: blendix
Date: 2010-06-22 20:36:30 +0200 (Tue, 22 Jun 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29614:29626
Modified Paths:
--------------
branches/render25/release/scripts/ui/space_sequencer.py
branches/render25/source/blender/blenkernel/intern/multires.c
branches/render25/source/blender/editors/space_view3d/view3d_edit.c
Modified: branches/render25/release/scripts/ui/space_sequencer.py
===================================================================
--- branches/render25/release/scripts/ui/space_sequencer.py 2010-06-22 18:18:42 UTC (rev 29626)
+++ branches/render25/release/scripts/ui/space_sequencer.py 2010-06-22 18:36:30 UTC (rev 29627)
@@ -358,8 +358,8 @@
col.prop(strip, "channel")
col.prop(strip, "frame_start")
subrow = col.split(percentage=0.66)
- subrow.prop(strip, "frame_length_final")
- subrow.label(text="%.2f sec" % (strip.frame_length_final / (render.fps / render.fps_base)))
+ subrow.prop(strip, "frame_final_length")
+ subrow.label(text="%.2f sec" % (strip.frame_final_length / (render.fps / render.fps_base)))
col = layout.column(align=True)
col.label(text="Offset:")
Modified: branches/render25/source/blender/blenkernel/intern/multires.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/multires.c 2010-06-22 18:18:42 UTC (rev 29626)
+++ branches/render25/source/blender/blenkernel/intern/multires.c 2010-06-22 18:36:30 UTC (rev 29627)
@@ -459,6 +459,7 @@
/* create subsurf DM from original mesh at high level */
cddm = CDDM_from_mesh(me, NULL);
+ DM_set_only_copy(cddm, CD_MASK_BAREMESH);
highdm = subsurf_dm_create_local(ob, cddm, totlvl, simple, 0);
/* create multires DM from original mesh at low level */
@@ -656,6 +657,7 @@
/* create subsurf DM from original mesh at high level */
if (ob->derivedDeform) cddm = CDDM_copy(ob->derivedDeform);
else cddm = CDDM_from_mesh(me, NULL);
+ DM_set_only_copy(cddm, CD_MASK_BAREMESH);
highdm = subsurf_dm_create_local(ob, cddm, totlvl, mmd->simple, 0);
@@ -709,6 +711,7 @@
if (ob->derivedDeform) cddm = CDDM_copy(ob->derivedDeform);
else cddm = CDDM_from_mesh(me, NULL);
+ DM_set_only_copy(cddm, CD_MASK_BAREMESH);
subdm = subsurf_dm_create_local(ob, cddm, mmd->totlvl, mmd->simple, 0);
cddm->release(cddm);
Modified: branches/render25/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- branches/render25/source/blender/editors/space_view3d/view3d_edit.c 2010-06-22 18:18:42 UTC (rev 29626)
+++ branches/render25/source/blender/editors/space_view3d/view3d_edit.c 2010-06-22 18:36:30 UTC (rev 29627)
@@ -1242,7 +1242,17 @@
minmax_object(base->object, min, max);
}
}
- if(!onedone) return OPERATOR_FINISHED; /* TODO - should this be cancel? */
+ if(!onedone) {
+ ED_region_tag_redraw(ar);
+ /* TODO - should this be cancel?
+ * I think no, because we always move the cursor, with or without
+ * object, but in this case there is no change in the scene,
+ * only the cursor so I choice a ED_region_tag like
+ * smooth_view do for the center_cursor.
+ * See bug #22640
+ */
+ return OPERATOR_FINISHED;
+ }
afm[0]= (max[0]-min[0]);
afm[1]= (max[1]-min[1]);
More information about the Bf-blender-cvs
mailing list