[Bf-blender-cvs] [e99919f] master: Freestyle: For until c++11 is accepted only static members could b initialized in-lined

[Sergey Sharybin]

Commit: e99919f713709d72c5610fa4082e450d75c4f593
Author: Sergey Sharybin
Date:   Thu Oct 2 19:24:16 2014 +0600
Branches: master
https://developer.blender.org/rBe99919f713709d72c5610fa4082e450d75c4f593

Freestyle: For until c++11 is accepted only static members could b initialized 
in-lined

===================================================================

M       source/blender/freestyle/intern/application/Controller.cpp
M       source/blender/freestyle/intern/application/Controller.h
M       source/blender/makesrna/intern/rna_scene.c

===================================================================

diff --git a/source/blender/freestyle/intern/application/Controller.cpp 
b/source/blender/freestyle/intern/application/Controller.cpp
index 29fed06..7ecb416 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 84ee338..9fe57d9 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 9af38ae..70ce87a 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();

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs