Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-05-16 11:47:43 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-05-16 11:47:43 +0300
commit961927572956eab83ce6f99ad1f5bc5ec0987f7e (patch)
treee318799a9a09340f0bde5d5b00295a3836700145 /source/blender/draw/modes/sculpt_mode.c
parent027ae0fdef9292b915ed5a4c9b9fb2a82f6ea8f7 (diff)
Correct last commit, missing assignment
Diffstat (limited to 'source/blender/draw/modes/sculpt_mode.c')
-rw-r--r--source/blender/draw/modes/sculpt_mode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/modes/sculpt_mode.c b/source/blender/draw/modes/sculpt_mode.c
index b55e3236ed9..7bbf551bcd9 100644
--- a/source/blender/draw/modes/sculpt_mode.c
+++ b/source/blender/draw/modes/sculpt_mode.c
@@ -194,11 +194,10 @@ static void SCULPT_cache_populate(void *vedata, Object *ob)
SceneLayer *sl = draw_ctx->sl;
if (ob->sculpt && ob == OBACT_NEW) {
- PBVH *pbvh = ob->sculpt->pbvh;
/* XXX, needed for dyntopo-undo (which clears).
* probably depsgraph should handlle? in 2.7x getting derived-mesh does this (mesh_build_data) */
- if (pbvh == NULL) {
+ if (ob->sculpt->pbvh == NULL) {
/* create PBVH immediately (would be created on the fly too,
* but this avoids waiting on first stroke) */
Scene *scene = draw_ctx->scene;
@@ -206,6 +205,7 @@ static void SCULPT_cache_populate(void *vedata, Object *ob)
BKE_sculpt_update_mesh_elements(scene, scene->toolsettings->sculpt, ob, false, false);
}
+ PBVH *pbvh = ob->sculpt->pbvh;
if (pbvh && pbvh_has_mask(pbvh)) {
/* Get geometry cache */
DRWShadingGroup *shgroup = object_is_flat(ob) ? stl->g_data->group_flat : stl->g_data->group_smooth;