Commit: 7de6ed780d637a7dca5725858e237aaa2d4dd635
Author: Sergey Sharybin
Date: Mon Apr 13 15:48:47 2015 +0500
Branches: alembic
https://developer.blender.org/rB7de6ed780d637a7dca5725858e237aaa2d4dd635
Alembic: Fix compilation error with alembic disabled
Was a mismatch in stub factory methods, presumably after some recent
changes in hair/strands.
===================================================================
M source/blender/pointcache/PTC_api.cpp
===================================================================
diff --git a/source/blender/pointcache/PTC_api.cpp
b/source/blender/pointcache/PTC_api.cpp
index 6317455..abab860 100644
--- a/source/blender/pointcache/PTC_api.cpp
+++ b/source/blender/pointcache/PTC_api.cpp
@@ -71,8 +71,8 @@ class StubFactory : public Factory {
Writer *create_writer_derived_final_render(const std::string &/*name*/,
Scene */*scene*/, Object */*ob*/, DerivedMesh **/*render_dm_ptr*/) { return
NULL; }
Writer *create_writer_dupligroup(const std::string &/*name*/,
EvaluationContext */*eval_ctx*/, Scene */*scene*/, Group */*group*/,
CacheLibrary */*cachelib*/) { return NULL; }
Writer *create_writer_duplicache(const std::string &/*name*/, Group
*/*group*/, DupliCache */*dupcache*/, int /*datatypes*/, bool /*do_sim_debug*/)
{ return NULL; }
- Reader *create_reader_duplicache(const std::string &/*name*/, Group
*/*group*/, DupliCache */*dupcache*/, bool /*do_sim_debug*/) { return NULL; }
- Reader *create_reader_duplicache_object(const std::string &/*name*/,
Object */*ob*/, DupliObjectData */*data*/) { return NULL; }
+ Reader *create_reader_duplicache(const std::string &/*name*/, Group
*/*group*/, DupliCache */*dupcache*/, bool /*read_strands_motion*/, bool
/*read_strands_children*/, bool /*do_sim_debug*/) { return NULL; }
+ Reader *create_reader_duplicache_object(const std::string &/*name*/,
Object */*ob*/, DupliObjectData */*data*/, bool /*read_strands_motion*/, bool
/*read_strands_children*/) { return NULL; }
};
#ifndef WITH_PTC_ALEMBIC
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
