diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-16 13:17:45 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-16 13:24:41 +0300 |
| commit | 5baf0de6e74a4df43dea91e177aeece5468648c4 (patch) | |
| tree | 8cd672b0946e29e75514c6513b0de1f271ad8d12 /source/blender/blenkernel/intern/material.c | |
| parent | 7e954d974a5955bd347f1dd070660d45af6ea789 (diff) | |
| parent | 3baf31e73a7176fac8081b6648ce768b9504c2b1 (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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 87a57e2973a..a0059a99473 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -72,6 +72,7 @@ #include "BKE_editmesh.h" #include "BKE_font.h" +#include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" #include "GPU_material.h" @@ -1774,9 +1775,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_EVAL) { - printf("%s on %s (%p)\n", __func__, material->id.name, material); - } + DEG_debug_print_eval(__func__, material->id.name, material); if ((BLI_listbase_is_empty(&material->gpumaterial) == false)) { GPU_material_uniform_buffer_tag_dirty(&material->gpumaterial); } |