diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-02 17:24:16 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-02 17:24:16 +0400 |
commit | e99919f713709d72c5610fa4082e450d75c4f593 (patch) | |
tree | e2bf7302f374ba6d9244a46c16c3eb1d152f3c93 /source | |
parent | 617131410c74bc0291ede50803e5d9badff2a0c9 (diff) |
Freestyle: For until c++11 is accepted only static members could b initialized in-lined
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/freestyle/intern/application/Controller.cpp | 1 | ||||
-rw-r--r-- | source/blender/freestyle/intern/application/Controller.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index 29fed062cdf..7ecb4164caf 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -127,6 +127,7 @@ Controller::Controller() _ComputeMaterialBoundaries = true; _sphereRadius = 1.0; _creaseAngle = 134.43; + prevSceneHash = -1.0; init_options(); } diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h index 84ee3382612..9fe57d92cf4 100644 --- a/source/blender/freestyle/intern/application/Controller.h +++ b/source/blender/freestyle/intern/application/Controller.h @@ -251,7 +251,7 @@ private: FEdgeXDetector edgeDetector; SceneHash sceneHashFunc; - real prevSceneHash = -1.0; + real prevSceneHash; #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:Controller") diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 9af38ae2322..70ce87ab68b 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1183,7 +1183,7 @@ static void rna_Scene_freestyle_update(Main *UNUSED(bmain), Scene *UNUSED(scene) DAG_id_tag_update(&scene->id, 0); } -static void rna_Scene_use_view_map_cache_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) +static void rna_Scene_use_view_map_cache_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *UNUSED(ptr)) { #ifdef WITH_FREESTYLE FRS_free_view_map_cache(); |