[Bf-blender-cvs] [a3b9322845d] lanpr-under-gp: LineArt: Merge changes.
YimingWu
noreply at git.blender.org
Fri Mar 5 12:59:13 CET 2021
Commit: a3b9322845dec4b4a57153aecfd025133784ebf0
Author: YimingWu
Date: Fri Mar 5 19:58:53 2021 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBa3b9322845dec4b4a57153aecfd025133784ebf0
LineArt: Merge changes.
===================================================================
M source/blender/editors/render/render_update.c
M source/blender/editors/space_buttons/buttons_context.c
===================================================================
diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c
index 555772b6759..3260a31bcbe 100644
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -107,7 +107,7 @@ void ED_render_view3d_update(Depsgraph *depsgraph,
* way we could avoid some unecessary updating.
*/
if (updated) {
- ED_lineart_post_frame_update_external(C, scene, update_ctx->depsgraph, false);
+ ED_lineart_post_frame_update_external(C, scene, depsgraph, false);
}
#endif
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index edc63484a66..dc3548d08fb 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -33,6 +33,7 @@
#include "DNA_armature_types.h"
#include "DNA_brush_types.h"
+#include "DNA_collection_types.h"
#include "DNA_linestyle_types.h"
#include "DNA_material_types.h"
#include "DNA_node_types.h"
More information about the Bf-blender-cvs
mailing list