diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-21 12:51:58 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-21 12:51:58 +0300 |
| commit | d4ee0cee51e01cf62acc1e239844fcb6c7dbf449 (patch) | |
| tree | eefa73fcc2fcf614707d409c4c8571f268afdeef /source/blender/blenkernel/intern/material.c | |
| parent | bfa51b1b0c705780bccbf551e81baa5846fd6a85 (diff) | |
| parent | fe1a508e551bc8309f552d69da0b74f7f5f5d46f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 7235aa0aaf6..0117cfcc022 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1772,7 +1772,7 @@ bool BKE_object_material_edit_image_set(Object *ob, short mat_nr, Image *image) void BKE_material_eval(const struct EvaluationContext *UNUSED(eval_ctx), Material *material) { - if (G.debug & G_DEBUG_DEPSGRAPH) { + if (G.debug & G_DEBUG_DEPSGRAPH_EVAL) { printf("%s on %s (%p)\n", __func__, material->id.name, material); } if ((BLI_listbase_is_empty(&material->gpumaterial) == false)) { |