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:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-02-28 20:39:55 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-02-28 20:41:37 +0300
commitf864cbd705e5773c4dc8a698bae0bee86ba62d5c (patch)
tree57d696391ad4500cfc549d3a3ecfe6db5946f579 /source/blender/depsgraph
parentd3294fd93f5a5cc6536d688365efddffca78e870 (diff)
Cleanup: Snake style in depsgraph
While it's kind of common to use camel case in C++ this is not currently agreed style for C++ in Blender. Got confused by working on other areas with 3rd party libraries.
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder.cc6
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder.h2
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc2
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc2
4 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index e927d6c9b5c..e7111bd5202 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -80,7 +80,7 @@ void visibility_animated_check_cb(ID * /*id*/, FCurve *fcu, void *user_data)
}
}
-bool isObjectVisibilityAnimated(Depsgraph *graph, Object *object)
+bool is_object_visibility_animated(Depsgraph *graph, Object *object)
{
AnimData* anim_data = BKE_animdata_from_id(&object->id);
if (anim_data == NULL) {
@@ -100,14 +100,14 @@ DepsgraphBuilder::DepsgraphBuilder(Main *bmain, Depsgraph *graph)
graph_(graph) {
}
-bool DepsgraphBuilder::needPullBaseIntoGraph(struct Base *base)
+bool DepsgraphBuilder::need_pull_base_into_graph(struct Base *base)
{
const int base_flag = (graph_->mode == DAG_EVAL_VIEWPORT) ?
BASE_ENABLED_VIEWPORT : BASE_ENABLED_RENDER;
if (base->flag & base_flag) {
return true;
}
- if (isObjectVisibilityAnimated(graph_, base->object)) {
+ if (is_object_visibility_animated(graph_, base->object)) {
return true;
}
return false;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.h b/source/blender/depsgraph/intern/builder/deg_builder.h
index e64ae98c6ce..7c9f496ae7e 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder.h
@@ -32,7 +32,7 @@ struct Depsgraph;
class DepsgraphBuilder {
public:
- bool needPullBaseIntoGraph(struct Base *base);
+ bool need_pull_base_into_graph(struct Base *base);
protected:
DepsgraphBuilder(Main *bmain, Depsgraph *graph);
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
index db1cfa6b83f..beb67af8bf6 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
@@ -99,7 +99,7 @@ void DepsgraphNodeBuilder::build_view_layer(
int base_index = 0;
LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
/* object itself */
- if (needPullBaseIntoGraph(base)) {
+ if (need_pull_base_into_graph(base)) {
/* NOTE: We consider object visible even if it's currently
* restricted by the base/restriction flags. Otherwise its drivers
* will never be evaluated.
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
index 54a72d3b8d4..8d5f74337b6 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
@@ -84,7 +84,7 @@ void DepsgraphRelationBuilder::build_view_layer(Scene *scene, ViewLayer *view_la
* passed to the evaluation functions. During relations builder we only
* do NULL-pointer check of the base, so it's fine to pass original one. */
LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
- if (needPullBaseIntoGraph(base)) {
+ if (need_pull_base_into_graph(base)) {
build_object(base, base->object);
}
}