[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43935] branches/bmesh/blender: svn merge ^/trunk/blender -r43918:43934
Campbell Barton
ideasman42 at gmail.com
Mon Feb 6 23:21:43 CET 2012
Revision: 43935
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43935
Author: campbellbarton
Date: 2012-02-06 22:21:41 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43918:43934
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43918
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/animation/anim_markers.c
branches/bmesh/blender/source/blender/editors/interface/interface_ops.c
branches/bmesh/blender/source/blender/editors/space_clip/space_clip.c
branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
branches/bmesh/blender/source/blender/editors/space_image/space_image.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
Property Changed:
----------------
branches/bmesh/blender/
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,43872
/trunk/blender:39992-43918
+ /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
/trunk/blender:39992-43934
Modified: branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/intern/readfile.c 2012-02-06 22:17:41 UTC (rev 43934)
+++ branches/bmesh/blender/source/blender/blenloader/intern/readfile.c 2012-02-06 22:21:41 UTC (rev 43935)
@@ -4843,8 +4843,8 @@
(void)marker;
#endif
- if(sce->ed)
- seq_update_muting(sce->ed);
+ seq_update_muting(sce->ed);
+ seq_update_sound_bounds_all(sce);
if(sce->nodetree) {
lib_link_ntree(fd, &sce->id, sce->nodetree);
Modified: branches/bmesh/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/animation/anim_markers.c 2012-02-06 22:17:41 UTC (rev 43934)
+++ branches/bmesh/blender/source/blender/editors/animation/anim_markers.c 2012-02-06 22:21:41 UTC (rev 43935)
@@ -439,22 +439,28 @@
void draw_markers_time(const bContext *C, int flag)
{
ListBase *markers= ED_context_get_markers(C);
- View2D *v2d= UI_view2d_fromcontext(C);
+ View2D *v2d;
TimeMarker *marker;
-
+ Scene *scene;
+
if (markers == NULL)
return;
-
+
+ scene = CTX_data_scene(C);
+ v2d = UI_view2d_fromcontext(C);
+
/* unselected markers are drawn at the first time */
for (marker= markers->first; marker; marker= marker->next) {
- if ((marker->flag & SELECT) == 0)
- draw_marker(v2d, marker, CTX_data_scene(C)->r.cfra, flag);
+ if ((marker->flag & SELECT) == 0) {
+ draw_marker(v2d, marker, scene->r.cfra, flag);
+ }
}
/* selected markers are drawn later */
for (marker= markers->first; marker; marker= marker->next) {
- if (marker->flag & SELECT)
- draw_marker(v2d, marker, CTX_data_scene(C)->r.cfra, flag);
+ if (marker->flag & SELECT) {
+ draw_marker(v2d, marker, scene->r.cfra, flag);
+ }
}
}
@@ -550,7 +556,8 @@
if (markers == NULL)
return OPERATOR_CANCELLED;
- /* two markers can't be at the same place */
+ /* prefer not having 2 markers at the same place,
+ * though the user can move them to overlap once added */
for (marker= markers->first; marker; marker= marker->next) {
if (marker->frame == frame)
return OPERATOR_CANCELLED;
Modified: branches/bmesh/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/interface/interface_ops.c 2012-02-06 22:17:41 UTC (rev 43934)
+++ branches/bmesh/blender/source/blender/editors/interface/interface_ops.c 2012-02-06 22:21:41 UTC (rev 43935)
@@ -103,7 +103,8 @@
static void eyedropper_sample(bContext *C, Eyedropper *eye, int mx, int my)
{
if(RNA_property_type(eye->prop) == PROP_FLOAT) {
- const int color_manage = CTX_data_scene(C)->r.color_mgt_flag & R_COLOR_MANAGEMENT;
+ Scene *scene = CTX_data_scene(C);
+ const int color_manage = scene->r.color_mgt_flag & R_COLOR_MANAGEMENT;
float col[4];
RNA_property_float_get_array(&eye->ptr, eye->prop, col);
Modified: branches/bmesh/blender/source/blender/editors/space_clip/space_clip.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_clip/space_clip.c 2012-02-06 22:17:41 UTC (rev 43934)
+++ branches/bmesh/blender/source/blender/editors/space_clip/space_clip.c 2012-02-06 22:21:41 UTC (rev 43935)
@@ -593,6 +593,7 @@
{
wmWindowManager *wm= CTX_wm_manager(C);
wmWindow *window= CTX_wm_window(C);
+ Scene *scene = CTX_data_scene(C);
SpaceClip *sc= (SpaceClip *)sa->spacedata.first;
ARegion *ar_main= BKE_area_find_region_type(sa, RGN_TYPE_WINDOW);
ARegion *ar_preview= clip_has_preview_region(C, sa);
@@ -634,7 +635,7 @@
ED_area_tag_redraw(sa);
}
- BKE_movieclip_user_set_frame(&sc->user, CTX_data_scene(C)->r.cfra);
+ BKE_movieclip_user_set_frame(&sc->user, scene->r.cfra);
}
/********************* main region ********************/
Modified: branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_image/image_ops.c 2012-02-06 22:17:41 UTC (rev 43934)
+++ branches/bmesh/blender/source/blender/editors/space_image/image_ops.c 2012-02-06 22:21:41 UTC (rev 43935)
@@ -594,7 +594,7 @@
/* retrieve state */
sima= CTX_wm_space_image(C);
ar= CTX_wm_region(C);
- scene= (Scene*)CTX_data_scene(C);
+ scene= CTX_data_scene(C);
obedit= CTX_data_edit_object(C);
ima= ED_space_image(sima);
@@ -1445,7 +1445,7 @@
/* retrieve state */
sima= CTX_wm_space_image(C);
- scene= (Scene*)CTX_data_scene(C);
+ scene= CTX_data_scene(C);
obedit= CTX_data_edit_object(C);
RNA_string_get(op->ptr, "name", name);
Modified: branches/bmesh/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_image/space_image.c 2012-02-06 22:17:41 UTC (rev 43934)
+++ branches/bmesh/blender/source/blender/editors/space_image/space_image.c 2012-02-06 22:21:41 UTC (rev 43935)
@@ -580,7 +580,7 @@
ima= ED_space_image(sima);
if(sima->iuser.flag & IMA_ANIM_ALWAYS)
- BKE_image_user_calc_frame(&sima->iuser, CTX_data_scene(C)->r.cfra, 0);
+ BKE_image_user_calc_frame(&sima->iuser, scene->r.cfra, 0);
/* check if we have to set the image from the editmesh */
if(ima && (ima->source==IMA_SRC_VIEWER || sima->pin));
Modified: branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_node/node_edit.c 2012-02-06 22:17:41 UTC (rev 43934)
+++ branches/bmesh/blender/source/blender/editors/space_node/node_edit.c 2012-02-06 22:21:41 UTC (rev 43935)
@@ -1341,9 +1341,10 @@
static void sample_draw(const bContext *C, ARegion *ar, void *arg_info)
{
+ Scene *scene = CTX_data_scene(C);
ImageSampleInfo *info= arg_info;
- ED_image_draw_info(ar, (CTX_data_scene(C)->r.color_mgt_flag & R_COLOR_MANAGEMENT), info->channels,
+ ED_image_draw_info(ar, (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT), info->channels,
info->x, info->y, info->col, info->colf,
NULL, NULL /* zbuf - unused for nodes */
);
More information about the Bf-blender-cvs
mailing list