[Bf-blender-cvs] [160cb9a2847] blender2.8: Merge branch 'master' into blender2.8
Bastien Montagne
noreply at git.blender.org
Mon Jun 11 14:40:23 CEST 2018
Commit: 160cb9a28477ccd1d8bdbf5265464dfdbea09d2c
Author: Bastien Montagne
Date: Mon Jun 11 14:39:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB160cb9a28477ccd1d8bdbf5265464dfdbea09d2c
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/blender_object.cpp
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_mball.cc
source/blender/alembic/intern/abc_mball.h
source/blender/blenkernel/BKE_anim.h
source/blender/blenkernel/BKE_displist.h
source/blender/blenkernel/BKE_dynamicpaint.h
source/blender/blenkernel/BKE_group.h
source/blender/blenkernel/BKE_mball.h
source/blender/blenkernel/BKE_mball_tessellate.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/BKE_scene.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/mball_tessellate.c
source/blender/blenkernel/intern/mesh_convert.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/object_dupli.c
source/blender/blenkernel/intern/object_update.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/smoke.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/include/ED_object.h
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modifier.c
source/blender/editors/physics/dynamicpaint_ops.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt_uv.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap_object.c
source/blender/editors/util/ed_util.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesrna/intern/rna_meta.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_displist.h
index 09e9b667369,f5c6fb37ccc..6dd40b7a651
--- a/source/blender/blenkernel/BKE_displist.h
+++ b/source/blender/blenkernel/BKE_displist.h
@@@ -57,11 -57,12 +57,12 @@@ enum
/* prototypes */
- struct Scene;
- struct Object;
- struct ListBase;
+struct Depsgraph;
struct DerivedMesh;
-struct EvaluationContext;
+ struct ListBase;
+ struct Main;
+ struct Object;
+ struct Scene;
/* used for curves, nurbs, mball, importing */
typedef struct DispList {
diff --cc source/blender/blenkernel/BKE_dynamicpaint.h
index a0814fc9183,cc1ff1a2375..0a759629930
--- a/source/blender/blenkernel/BKE_dynamicpaint.h
+++ b/source/blender/blenkernel/BKE_dynamicpaint.h
@@@ -27,9 -27,9 +27,10 @@@
* \ingroup bke
*/
-struct EvaluationContext;
+struct Depsgraph;
+ struct Main;
struct Scene;
+struct ViewLayer;
/* Actual surface point */
typedef struct PaintSurfaceData {
@@@ -86,7 -87,10 +87,9 @@@ struct DynamicPaintSurface *get_activeS
/* image sequence baking */
int dynamicPaint_createUVSurface(struct Scene *scene, struct DynamicPaintSurface *surface, float *progress, short *do_update);
- int dynamicPaint_calculateFrame(struct DynamicPaintSurface *surface, struct Depsgraph *depsgraph, struct Scene *scene, struct Object *cObject, int frame);
+ int dynamicPaint_calculateFrame(
- struct Main *bmain,
- struct EvaluationContext *eval_ctx, struct DynamicPaintSurface *surface, struct Scene *scene,
- struct Object *cObject, int frame);
++ struct DynamicPaintSurface *surface, struct Depsgraph *depsgraph,
++ struct Scene *scene, struct Object *cObject, int frame);
void dynamicPaint_outputSurfaceImage(struct DynamicPaintSurface *surface, char *filename, short output_layer);
/* PaintPoint state */
diff --cc source/blender/blenkernel/BKE_mball_tessellate.h
index df652df177d,254d5e9248a..363bfe09c75
--- a/source/blender/blenkernel/BKE_mball_tessellate.h
+++ b/source/blender/blenkernel/BKE_mball_tessellate.h
@@@ -23,7 -23,8 +23,8 @@@
/** \file BKE_mball_tessellate.h
* \ingroup bke
*/
-struct EvaluationContext;
+struct Depsgraph;
+ struct Main;
struct Object;
struct Scene;
diff --cc source/blender/blenkernel/BKE_object.h
index 6172c9998af,9d99a0ad84b..482d39b5e68
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@@ -245,28 -223,19 +245,26 @@@ void BKE_object_eval_transform_all
struct Scene *scene,
struct Object *object);
-void BKE_object_handle_data_update(
- struct Main *bmain,
- struct EvaluationContext *eval_ctx,
- struct Scene *scene,
- struct Object *ob);
-void BKE_object_handle_update(
- struct Main *bmain,
- struct EvaluationContext *eval_ctx,
+void BKE_object_eval_update_shading(
+ struct Depsgraph *depsgraph,
+ struct Object *object);
+void BKE_object_data_select_update(
+ struct Depsgraph *depsgraph,
+ struct ID *object_data);
+
+void BKE_object_eval_flush_base_flags(
+ struct Depsgraph *depsgraph,
+ struct Scene *scene, const int view_layer_index,
+ struct Object *object, int base_index,
+ const bool is_from_set);
+
- void BKE_object_handle_data_update(
- struct Depsgraph *depsgraph,
++void BKE_object_handle_data_update(struct Depsgraph *depsgraph,
struct Scene *scene,
struct Object *ob);
- void BKE_object_handle_update(
- struct Depsgraph *depsgraph,
++void BKE_object_handle_update(struct Depsgraph *depsgraph,
+ struct Scene *scene, struct Object *ob);
void BKE_object_handle_update_ex(
- struct Main *bmain,
- struct EvaluationContext *eval_ctx,
+ struct Depsgraph *depsgraph,
struct Scene *scene, struct Object *ob,
struct RigidBodyWorld *rbw,
const bool do_proxy_update);
diff --cc source/blender/blenkernel/intern/displist.c
index a591ab354f6,f59691dd70e..5e812d4e5d0
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@@ -52,10 -51,10 +52,11 @@@
#include "BKE_displist.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_object.h"
+#include "BKE_library.h"
+ #include "BKE_main.h"
#include "BKE_mball.h"
#include "BKE_mball_tessellate.h"
+#include "BKE_mesh.h"
#include "BKE_curve.h"
#include "BKE_key.h"
#include "BKE_anim.h"
diff --cc source/blender/blenkernel/intern/dynamicpaint.c
index 36452e1d2cf,ab5fe1d45f5..0b2c65a7b8d
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@@ -3645,7 -3746,7 +3645,7 @@@ static void dynamic_paint_brush_velocit
}
static void dynamicPaint_brushMeshCalculateVelocity(
- struct Depsgraph *depsgraph, Scene *scene,
- Main *bmain, EvaluationContext *eval_ctx, Scene *scene,
++ Depsgraph *depsgraph, Scene *scene,
Object *ob, DynamicPaintBrushSettings *brush, Vec3f **brushVel, float timescale)
{
float prev_obmat[4][4];
@@@ -3710,7 -3811,8 +3710,8 @@@
}
/* calculate velocity for object center point */
- static void dynamicPaint_brushObjectCalculateVelocity(struct Depsgraph *depsgraph, Scene *scene, Object *ob, Vec3f *brushVel, float timescale)
+ static void dynamicPaint_brushObjectCalculateVelocity(
- Main *bmain, EvaluationContext *eval_ctx, Scene *scene, Object *ob, Vec3f *brushVel, float timescale)
++ Depsgraph *depsgraph, Scene *scene, Object *ob, Vec3f *brushVel, float timescale)
{
float prev_obmat[4][4];
float cur_loc[3] = {0.0f}, prev_loc[3] = {0.0f};
@@@ -4096,9 -4210,12 +4097,9 @@@ static void dynamic_paint_paint_mesh_ce
}
}
- static int dynamicPaint_paintMesh(struct Depsgraph *depsgraph, DynamicPaintSurface *surface,
-static int dynamicPaint_paintMesh(Main *bmain,
- EvaluationContext *eval_ctx,
- DynamicPaintSurface *surface,
++static int dynamicPaint_paintMesh(Depsgraph *depsgraph, DynamicPaintSurface *surface,
DynamicPaintBrushSettings *brush,
Object *brushOb,
- BrushMaterials *bMats,
Scene *scene,
float timescale)
{
@@@ -4584,8 -4718,8 +4585,8 @@@ static void dynamic_paint_paint_single_
}
static int dynamicPaint_paintSinglePoint(
- struct Depsgraph *depsgraph, DynamicPaintSurface *surface, float *pointCoord, DynamicPaintBrushSettings *brush,
- Main *bmain, EvaluationContext *eval_ctx, DynamicPaintSurface *surface, float *pointCoord, DynamicPaintBrushSettings *brush,
- Object *brushOb, BrushMaterials *bMats, Scene *scene, float timescale)
++ Depsgraph *depsgraph, DynamicPaintSurface *surface, float *pointCoord, DynamicPaintBrushSettings *brush,
+ Object *brushOb, Scene *scene, float timescale)
{
PaintSurfaceData *sData = surface->data;
float brush_radius = brush->paint_distance * surface->radius_scale;
@@@ -5882,7 -6016,9 +5883,9 @@@ static int dynamicPaint_generateBakeDat
/*
* Do Dynamic Paint step. Paints scene brush objects of current state/frame to the surface.
*/
- static int dynamicPaint_doStep(struct Depsgraph *depsgraph, Scene *scene, Object *ob, DynamicPaintSurface *surface, float timescale, float subframe)
+ static int dynamicPaint_doStep(
- Main *bmain, EvaluationContext *eval_ctx, Scene *scene,
++ Depsgraph *depsgraph, Scene *scene,
+ Object *ob, DynamicPaintSurface *surface, float timescale, float subframe)
{
PaintSurfaceData *sData = surface->data;
PaintBakeData *bData = sData->bData;
diff --cc source/blender/blenkernel/intern/mball_tessellate.c
index 0f13618c76a,cc82d12a776..7e26a0f7713
--- a/source/blender/blenkernel/intern/mball_tessellate.c
+++ b/source/blender/blenkernel/intern/mball_tessellate.c
@@@ -48,13 -48,12 +48,14 @@@
#include "BKE_global.h"
- #include "BKE_scene.h"
-#include "BKE_depsgraph.h"
#include "BKE_displist.h"
+ #include "BKE_main.h"
#include "BKE_mball_tessellate.h" /* own include */
+ #include "BKE_scene.h"
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
+
#include "BLI_strict_flags.h"
/* experimental (faster) normal calculation */
diff --cc source/blender/blenkernel/intern/object_dupli.c
index 324ad3a31dc,19450b88947..2d1c03cf883
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@@ -98,15 -97,19 +98,17 @@@ typedef struct DupliGenerator
static const DupliGenerator *get_dupli_generator(const DupliContext *ctx);
/* create initial context for root object */
- static void init_context(DupliContext *r_ctx, Depsgraph *depsgraph, Scene *scene, Object *ob, float space_mat[4][4])
+ static void init_context(
- DupliContext *r_ctx, Main *bmain, EvaluationContext *eval_ctx,
- Scene *scene, Object *ob, float space_mat[4][4], bool update)
++ DupliContext *r_ctx, Depsgraph *depsgraph,
++ Scene *scene, Object *ob, float space_mat[4][4])
{
- r_ctx->eval_ctx = eval_ctx;
- r_ctx->bmain = bmain;
+ r_ctx->depsgraph = depsgraph;
r_ctx->scene = scene;
- /* don't allow BKE_object_handle_update for viewport during render, can crash */
- r_ctx->do_update = update && !(G.is_rendering && eval_ctx->mode != DAG_EVAL_RENDER);
- r_ctx->animated = false;
- r_ctx->group = NULL;
+ r_ctx->view_layer = DEG_get_evaluated_view_layer(depsgraph);
+ r_ctx->collection = NULL;
r_ctx->object = ob;
+ r_ctx->obedit = OBEDIT_FROM_OBACT(ob);
if (space_mat)
copy_m4_m4(r_ctx->space_mat, space_mat);
else
diff --cc source/blender/blenkernel/intern/object_update.c
index 3b684ebfd94,bb738033f02..f0f31eebfbd
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@@ -38,39 -37,37 +38,40 @@@
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
#include "BLI_math.h"
-#include "BLI_threads.h"
- #include "BKE_global.h"
+ #include "BKE_animsys.h"
#include "BKE_armature.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list