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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-27 21:21:20 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-05-27 21:21:20 +0400
commit833ca58260ec024abde2d43ba39184f74e66e86b (patch)
tree37103b31c5daad4217a5d20f3381d469b073e359 /source/blender
parent722680d7cffd4f7ffe40799d3b1b1c5f3c2a4928 (diff)
Fix #35506: enter local view, enable render draw mode, exit local view. In this
case the render engine would keep working invisible in the background.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/space_view3d/view3d_view.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 15641f35b35..a3421295464 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -64,6 +64,8 @@
#include "ED_screen.h"
#include "ED_armature.h"
+#include "RE_engine.h"
+
#ifdef WITH_GAMEENGINE
#include "BL_System.h"
#endif
@@ -1216,6 +1218,13 @@ static void restore_localviewdata(ScrArea *sa, int free)
rv3d->localvd = NULL;
}
}
+
+ if (v3d->drawtype != OB_RENDER) {
+ if (rv3d->render_engine) {
+ RE_engine_free(rv3d->render_engine);
+ rv3d->render_engine = NULL;
+ }
+ }
}
}
}