[Bf-blender-cvs] [ef7abad] cycles_kernel_split: Cycles kernel split: get_*() vs. *_get() for class methods

[Sergey Sharybin]

Commit: ef7abadedd5724de3a99328d127b92c85faedb92
Author: Sergey Sharybin
Date:   Thu May 7 16:47:59 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rBef7abadedd5724de3a99328d127b92c85faedb92

Cycles kernel split: get_*() vs. *_get() for class methods

Prior to own changes in master it was all consistent to use get_ as a prefix
for class methods. Let's keep this consistent and probably make it consistent
in master as a separate commit as well.

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

M	intern/cycles/render/graph.h
M	intern/cycles/render/nodes.h
M	intern/cycles/render/session.cpp
M	intern/cycles/render/session.h
M	intern/cycles/render/shader.cpp

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

diff --git a/intern/cycles/render/graph.h b/intern/cycles/render/graph.h
index a4dcbda..e627100 100644
--- a/intern/cycles/render/graph.h
+++ b/intern/cycles/render/graph.h
@@ -218,13 +218,13 @@ public:
 	 * nodes which are most commonly used, further levels are extension
 	 * of previous one and includes less commonly used nodes.
 	 */
-	virtual int group_get() { return NODE_GROUP_LEVEL_0; }
+	virtual int get_group() { return NODE_GROUP_LEVEL_0; }
 
 	/* Node feature are used to disable huge nodes inside the group,
 	 * so it's possible to disable huge nodes inside of the required
 	 * nodes group.
 	 */
-	virtual int feature_get() { return 0; }
+	virtual int get_feature() { return 0; }
 };
 
 
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index 5d9be3a..ac7bbaf 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -415,7 +415,7 @@ public:
 
 	void attributes(Shader *shader, AttributeRequestSet *attributes);
 	bool has_spatial_varying() { return true; }
-	virtual int feature_get() { return NODE_FEATURE_HAIR; }
+	virtual int get_feature() { return NODE_FEATURE_HAIR; }
 };
 
 class ValueNode : public ShaderNode {
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index a46d624..5410689 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -641,7 +641,7 @@ void Session::run()
 			device->nodes_features = NODE_FEATURE_ALL;
 		}
 		else {
-			device->clos_max = max_closure_count_get();
+			device->clos_max = get_max_closure_count();
 			scene->shader_manager->get_requested_features(scene,
 			                                              device->nodes_max_group,
 			                                              device->nodes_features);
@@ -961,7 +961,7 @@ void Session::device_free()
 	 */
 }
 
-int Session::max_closure_count_get()
+int Session::get_max_closure_count()
 {
 	int max_closures = 0;
 	for(int i = 0; i < scene->shaders.size(); i++) {
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h
index 4406164..e7a3723 100644
--- a/intern/cycles/render/session.h
+++ b/intern/cycles/render/session.h
@@ -211,7 +211,7 @@ protected:
 	int max_closure_global;
 
 	/* Get maximum number of closures to be used in kernel. */
-	int max_closure_count_get();
+	int get_max_closure_count();
 };
 
 CCL_NAMESPACE_END
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp
index 2ff29e5..2eaba3f 100644
--- a/intern/cycles/render/shader.cpp
+++ b/intern/cycles/render/shader.cpp
@@ -487,8 +487,8 @@ void ShaderManager::get_requested_features(Scene *scene, int& max_group, int& fe
 	for(int i = 0; i < scene->shaders.size(); i++) {
 		Shader *shader = scene->shaders[i];
 		foreach(ShaderNode *node, shader->graph->nodes) {
-			max_group = min(max_group, node->group_get());
-			features |= node->feature_get();
+			max_group = min(max_group, node->get_group());
+			features |= node->get_feature();
 			if(node->special_type == SHADER_SPECIAL_TYPE_CLOSURE) {
 				BsdfNode *bsdf_node = static_cast<BsdfNode*>(node);
 				if(CLOSURE_IS_VOLUME(bsdf_node->closure)) {