Commit: 7083b22422c5b8eee7a49375f02b01c3fe37cf09
Author: Sebastián Barschkis
Date: Thu Aug 11 15:22:04 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB7083b22422c5b8eee7a49375f02b01c3fe37cf09
hooked up viewport viewing mode switch
===================================================================
M source/blender/editors/space_view3d/drawobject.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawobject.c
b/source/blender/editors/space_view3d/drawobject.c
index 28f0925..9b71de1 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -7965,7 +7965,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d,
Base *base, const short
#ifndef WITH_MANTA
if (!sds->wt || !(sds->viewsettings &
MOD_SMOKE_VIEW_SHOWBIG)) {
#else
- if (!(sds->fluid && sds->flags &
MOD_SMOKE_HIGHRES) || !(sds->viewsettings & MOD_SMOKE_VIEW_SHOWBIG)) {
+ if (!(sds->fluid && sds->flags &
MOD_SMOKE_HIGHRES) || sds->viewport_display_mode & SM_VIEWPORT_PREVIEW) {
#endif
sds->tex = NULL;
GPU_create_smoke(smd, 0);
@@ -7975,7 +7975,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d,
Base *base, const short
#ifndef WITH_MANTA
else if (sds->wt && (sds->viewsettings &
MOD_SMOKE_VIEW_SHOWBIG)) {
#else
- else if (sds->fluid && sds->flags &
MOD_SMOKE_HIGHRES && sds->viewsettings & MOD_SMOKE_VIEW_SHOWBIG) {
+ else if (sds->fluid && sds->flags &
MOD_SMOKE_HIGHRES && sds->viewport_display_mode & SM_VIEWPORT_FINAL) {
#endif
sds->tex = NULL;
GPU_create_smoke(smd, 1);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
