[Bf-blender-cvs] [0855126ee86] asset-metadata: Updates for changes in master

Julian Eisel noreply at git.blender.org
Mon Aug 24 20:07:36 CEST 2020


Commit: 0855126ee86c68e01c8c0ddfd82981bd1fa9db5d
Author: Julian Eisel
Date:   Mon Aug 24 20:05:43 2020 +0200
Branches: asset-metadata
https://developer.blender.org/rB0855126ee86c68e01c8c0ddfd82981bd1fa9db5d

Updates for changes in master

Needed after last merge.

===================================================================

M	source/blender/editors/render/render_preview.c
M	source/blender/editors/space_outliner/outliner_tools.c

===================================================================

diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 3f6b36d326d..8a29a08369d 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -772,8 +772,8 @@ static Scene *object_preview_scene_create(const struct ObjectPreviewData *previe
   /* For 'view selected' below. */
   preview_base->flag |= BASE_SELECTED;
 
-  DEG_graph_build_from_view_layer(depsgraph, preview_data->main, scene, view_layer);
-  DEG_evaluate_on_refresh(preview_data->main, depsgraph);
+  DEG_graph_build_from_view_layer(depsgraph);
+  DEG_evaluate_on_refresh(depsgraph);
 
   ED_view3d_camera_to_view_selected(preview_data->main, depsgraph, scene, camera_object);
 
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 55852fd161c..20a5476ea6d 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -1917,7 +1917,7 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
     }
     case OUTLINER_IDOP_CREATE_ASSET: {
       outliner_do_libdata_operation(
-          C, op->reports, scene, soops, &soops->tree, id_make_asset_cb, NULL);
+          C, op->reports, scene, space_outliner, &space_outliner->tree, id_make_asset_cb, NULL);
       ED_undo_push(C, "Made Asset");
       /* TODO how to handle undo here? id_make_asset_cb() calls an OP. Esp. in case of multiple
        * data-blocks we only want a single push. */



More information about the Bf-blender-cvs mailing list