[Bf-blender-cvs] [b3c4e30a7c3] blender2.8: Fix: MSVC2013 compile problems with the "inline" keyword
Joshua Leung
noreply at git.blender.org
Wed Jan 3 00:59:48 CET 2018
Commit: b3c4e30a7c3587ceed5854cc2f6e343c391abfb1
Author: Joshua Leung
Date: Wed Jan 3 12:58:19 2018 +1300
Branches: blender2.8
https://developer.blender.org/rBb3c4e30a7c3587ceed5854cc2f6e343c391abfb1
Fix: MSVC2013 compile problems with the "inline" keyword
===================================================================
M source/blender/editors/space_outliner/outliner_tree.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 4842b3cf789..22ce112f466 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1474,7 +1474,7 @@ static bool outliner_scene_collections_reorder_poll(
return true;
}
-static void inline outliner_add_scene_collection_init(TreeElement *te, SceneCollection *collection)
+BLI_INLINE void outliner_add_scene_collection_init(TreeElement *te, SceneCollection *collection)
{
te->name = collection->name;
te->directdata = collection;
@@ -1482,7 +1482,7 @@ static void inline outliner_add_scene_collection_init(TreeElement *te, SceneColl
te->reinsert_poll = outliner_scene_collections_reorder_poll;
}
-static void inline outliner_add_scene_collection_objects(
+BLI_INLINE void outliner_add_scene_collection_objects(
SpaceOops *soops, ListBase *tree, SceneCollection *collection, TreeElement *parent)
{
for (LinkData *link = collection->objects.first; link; link = link->next) {
More information about the Bf-blender-cvs
mailing list