[Bf-blender-cvs] [234caf4] depsgraph_refactor: Depsgraph: Fix compilation error with clang
Sergey Sharybin
noreply at git.blender.org
Wed Dec 31 11:18:49 CET 2014
Commit: 234caf4fca6239f4c237db009816a1137adbe888
Author: Sergey Sharybin
Date: Wed Dec 31 15:18:30 2014 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB234caf4fca6239f4c237db009816a1137adbe888
Depsgraph: Fix compilation error with clang
===================================================================
M source/blender/blenkernel/intern/object.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index f11a87c..672299f 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2019,7 +2019,8 @@ void BKE_object_to_mat4(Object *ob, float mat[4][4])
add_v3_v3v3(mat[3], ob->loc, ob->dloc);
}
-static void ob_get_parent_matrix(Scene *scene, Object *ob, Object *par, float parentmat[4][4]);
+/* XXX: expose this in a proper header, or shuffle the code around to get it working */
+extern void ob_get_parent_matrix(Scene *scene, Object *ob, Object *par, float parentmat[4][4]);
void BKE_object_matrix_local_get(struct Object *ob, float mat[4][4])
{
@@ -2318,8 +2319,6 @@ static void ob_parvert3(Object *ob, Object *par, float mat[4][4])
}
}
-/* XXX: expose this in a proper header, or shuffle the code around to get it working */
-extern void ob_get_parent_matrix(Scene *scene, Object *ob, Object *par, float parentmat[4][4]);
void ob_get_parent_matrix(Scene *scene, Object *ob, Object *par, float parentmat[4][4])
{
More information about the Bf-blender-cvs
mailing list