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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-01-24 03:32:09 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-01-24 03:32:09 +0400
commit12baf364f528f11db8f9c9d139ef97f657145c8f (patch)
tree495069a654e2d6a077ed28a9ab83d255eb9fd8fc /source/blender/freestyle
parent68ae82bb479a79de72cf174763f3244f64e28bb0 (diff)
Fix for invalid pointers within a copied line set.
Now the line set buffer is cleared when a new .blend file is opened, so that a line set may not be copied and pasted between two .blend files.
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r--source/blender/freestyle/FRS_freestyle.h1
-rw-r--r--source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp4
2 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h
index 6c1f7d454ba..f23f167b3a0 100644
--- a/source/blender/freestyle/FRS_freestyle.h
+++ b/source/blender/freestyle/FRS_freestyle.h
@@ -52,6 +52,7 @@ extern "C" {
// Rendering
void FRS_initialize(void);
void FRS_set_context(bContext* C);
+ void FRS_read_file(bContext* C);
int FRS_is_freestyle_enabled(struct SceneRenderLayer* srl);
void FRS_init_stroke_rendering(struct Render* re);
struct Render* FRS_do_stroke_rendering(struct Render* re, struct SceneRenderLayer* srl);
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index fe02406801a..2b054307365 100644
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -82,6 +82,10 @@ extern "C" {
controller->setContext(C);
}
+ void FRS_read_file(bContext* C) {
+ lineset_copied = false;
+ }
+
void FRS_exit() {
delete pathconfig;
delete controller;