[Bf-blender-cvs] [dc95c79971d] blender2.8: Merge branch 'master' into blender2.8
Sergey Sharybin
noreply at git.blender.org
Wed Oct 11 10:14:57 CEST 2017
Commit: dc95c79971d48dae9418e0047f14c01e6dcab13c
Author: Sergey Sharybin
Date: Wed Oct 11 13:14:16 2017 +0500
Branches: blender2.8
https://developer.blender.org/rBdc95c79971d48dae9418e0047f14c01e6dcab13c
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc intern/cycles/blender/blender_session.cpp
index f4e9da43454,9e54b7de573..75cc06ecd82
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@@ -147,7 -140,7 +146,7 @@@ void BlenderSession::create_session(
session->set_pause(session_pause);
/* create sync */
- sync = new BlenderSync(b_engine, b_data, b_depsgraph, b_scene, scene, !background, session->progress, is_cpu);
- sync = new BlenderSync(b_engine, b_data, b_scene, scene, !background, session->progress);
++ sync = new BlenderSync(b_engine, b_data, b_depsgraph, b_scene, scene, !background, session->progress);
BL::Object b_camera_override(b_engine.camera_override());
if(b_v3d) {
if(session_pause == false) {
@@@ -217,7 -209,7 +215,7 @@@ void BlenderSession::reset_session(BL::
session->stats.mem_peak = session->stats.mem_used;
/* sync object should be re-created */
- sync = new BlenderSync(b_engine, b_data, b_depsgraph, b_scene, scene, !background, session->progress, is_cpu);
- sync = new BlenderSync(b_engine, b_data, b_scene, scene, !background, session->progress);
++ sync = new BlenderSync(b_engine, b_data, b_depsgraph, b_scene, scene, !background, session->progress);
/* for final render we will do full data sync per render layer, only
* do some basic syncing here, no objects or materials for speed */
diff --cc intern/cycles/blender/blender_sync.cpp
index 432f67f3b5e,2e3301c4209..c1783045f66
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@@ -48,13 -47,10 +48,12 @@@ BlenderSync::BlenderSync(BL::RenderEngi
BL::Scene& b_scene,
Scene *scene,
bool preview,
- Progress &progress,
- bool is_cpu)
+ Progress &progress)
: b_engine(b_engine),
b_data(b_data),
+ b_depsgraph(b_depsgraph),
b_scene(b_scene),
+ b_scene_layer(b_engine.scene_layer()),
shader_map(&scene->shaders),
object_map(&scene->objects),
mesh_map(&scene->meshes),
diff --cc source/blender/editors/sculpt_paint/paint_cursor.c
index befb635cfc4,0cf39644bc1..2d2d5fa33c9
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@@ -1022,10 -1001,9 +1022,10 @@@ static void paint_draw_cursor(bContext
/* can't use stroke vc here because this will be called during
* mouse over too, not just during a stroke */
+ ViewContext vc;
view3d_set_viewcontext(C, &vc);
- if (vc.rv3d->rflag & RV3D_NAVIGATING) {
+ if (vc.rv3d && (vc.rv3d->rflag & RV3D_NAVIGATING)) {
return;
}
diff --cc source/blender/editors/sculpt_paint/paint_vertex.c
index 3fa1eda5d1e,f8509a3824c..7a0c6999623
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@@ -1336,10 -1278,7 +1285,8 @@@ static bool wpaint_stroke_test_start(bC
bool *defbase_sel;
SculptSession *ss = ob->sculpt;
VPaint *vp = CTX_data_tool_settings(C)->wpaint;
+ EvaluationContext eval_ctx;
- float mat[4][4], imat[4][4];
-
if (ED_wpaint_ensure_data(C, op->reports, WPAINT_ENSURE_MIRROR, &vgroup_index) == false) {
return false;
}
@@@ -1443,13 -1380,8 +1390,8 @@@
wpd->precomputed_weight = MEM_mallocN(sizeof(float) * me->totvert, __func__);
}
- /* imat for normals */
- mul_m4_m4m4(mat, wpd->vc.rv3d->viewmat, ob->obmat);
- invert_m4_m4(imat, mat);
- copy_m3_m4(wpd->wpimat, imat);
-
/* If not previously created, create vertex/weight paint mode session data */
- vertex_paint_init_session(scene, ob);
+ vertex_paint_init_session(&eval_ctx, scene, ob);
vwpaint_update_cache_invariants(C, vp, ss, op, mouse);
vertex_paint_init_session_data(ts, ob);
@@@ -2390,11 -2312,7 +2330,10 @@@ static bool vpaint_stroke_test_start(bC
struct VPaintData *vpd;
Object *ob = CTX_data_active_object(C);
Mesh *me;
- float mat[4][4], imat[4][4];
SculptSession *ss = ob->sculpt;
+ EvaluationContext eval_ctx;
+
+ CTX_data_eval_ctx(C, &eval_ctx);
/* context checks could be a poll() */
me = BKE_mesh_from_object(ob);
@@@ -2446,13 -2364,8 +2385,8 @@@
ob->sculpt->building_vp_handle = false;
}
- /* some old cruft to sort out later */
- mul_m4_m4m4(mat, vpd->vc.rv3d->viewmat, ob->obmat);
- invert_m4_m4(imat, mat);
- copy_m3_m4(vpd->vpimat, imat);
-
/* If not previously created, create vertex/weight paint mode session data */
- vertex_paint_init_session(scene, ob);
+ vertex_paint_init_session(&eval_ctx, scene, ob);
vwpaint_update_cache_invariants(C, vp, ss, op, mouse);
vertex_paint_init_session_data(ts, ob);
@@@ -3029,10 -2937,8 +2958,10 @@@ static void vpaint_stroke_update_step(b
swap_m4m4(vc->rv3d->persmat, mat);
+ BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
+
if (vp->paint.brush->vertexpaint_tool == PAINT_BLEND_SMEAR) {
- SWAP(uint *, vpd->smear.color_curr, vpd->smear.color_prev);
+ memcpy(vpd->smear.color_prev, vpd->smear.color_curr, sizeof(uint) * ((Mesh *)ob->data)->totloop);
}
/* calculate pivot for rotation around seletion if needed */
diff --cc source/blender/windowmanager/intern/wm_files_link.c
index af0d2be8097,7e6c6160b84..dbf0ff90ada
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@@ -316,10 -280,9 +316,10 @@@ static int wm_link_append_exec(bContex
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
+ SceneLayer *sl = CTX_data_scene_layer(C);
PropertyRNA *prop;
WMLinkAppendData *lapp_data;
- char path[FILE_MAX_LIBEXTRA], root[FILE_MAXDIR], libname[FILE_MAX], relname[FILE_MAX];
+ char path[FILE_MAX_LIBEXTRA], root[FILE_MAXDIR], libname[FILE_MAX_LIBEXTRA], relname[FILE_MAX];
char *group, *name;
int totfiles = 0;
short flag;
More information about the Bf-blender-cvs
mailing list