diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2016-11-02 12:48:06 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2016-11-02 12:59:52 +0300 |
commit | a41bbd3053c8f07c24ccb07eaeff09cc078cc4d4 (patch) | |
tree | aed76b27fa7b6fde5023b6d3ecd5f5079ed24aad /source/blender/editors/space_view3d/view3d_intern.h | |
parent | fb6f42dc4f0dc24a992a631b7aac3290449e815a (diff) | |
parent | 13ee9b8ebe08ee95478f51537f10e9a1b1e4d863 (diff) |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_intern.h')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index fb3ef8bd599..a5d8ebb7ce1 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -310,14 +310,8 @@ void draw_smoke_volume(struct SmokeDomainSettings *sds, struct Object *ob, const float min[3], const float max[3], const float viewnormal[3]); -//#define SMOKE_DEBUG_HEAT - void draw_smoke_velocity(struct SmokeDomainSettings *domain, float viewnormal[3]); -#ifdef SMOKE_DEBUG_HEAT -void draw_smoke_heat(struct SmokeDomainSettings *domain, struct Object *ob); -#endif - /* workaround for trivial but noticeable camera bug caused by imprecision * between view border calculation in 2D/3D space, workaround for bug [#28037]. * without this define we get the old behavior which is to try and align them |