[Bf-blender-cvs] [2f00f5b98f9] blender2.8: despgraph: Use regular iterators for erase, fixes build error on centOS
Ray Molenkamp
noreply at git.blender.org
Tue Sep 25 16:35:39 CEST 2018
Commit: 2f00f5b98f99d0e417645ff2689f51247d5def94
Author: Ray Molenkamp
Date: Tue Sep 25 08:35:31 2018 -0600
Branches: blender2.8
https://developer.blender.org/rB2f00f5b98f99d0e417645ff2689f51247d5def94
despgraph: Use regular iterators for erase, fixes build error on centOS
CentOS7 ships with gcc 4.8.2 which does not support the const_iterator for erase.
===================================================================
M source/blender/depsgraph/intern/depsgraph_query_filter.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_query_filter.cc b/source/blender/depsgraph/intern/depsgraph_query_filter.cc
index 11858bd1b1c..83963e7e5b2 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_filter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_filter.cc
@@ -137,7 +137,7 @@ static void deg_filter_remove_unwanted_ids(Depsgraph *graph, GSet *retained_ids)
}
/* 2) Remove unwanted operations from graph->operations */
- for (Depsgraph::OperationNodes::const_iterator it_opnode = graph->operations.begin();
+ for (Depsgraph::OperationNodes::iterator it_opnode = graph->operations.begin();
it_opnode != graph->operations.end();
)
{
@@ -157,7 +157,7 @@ static void deg_filter_remove_unwanted_ids(Depsgraph *graph, GSet *retained_ids)
* However, we don't worry about the conditional freeing for physics
* stuff, since it's rarely needed currently.
*/
- for (Depsgraph::IDDepsNodes::const_iterator it_id = graph->id_nodes.begin();
+ for (Depsgraph::IDDepsNodes::iterator it_id = graph->id_nodes.begin();
it_id != graph->id_nodes.end();
)
{
More information about the Bf-blender-cvs
mailing list