[Bf-blender-cvs] [e29c54674ce] blender2.8: Depsgraph: Fix strict compiler error with copy on write disabled

Sergey Sharybin noreply at git.blender.org
Wed Jul 19 17:34:16 CEST 2017


Commit: e29c54674cec166c079fbdf8cb63e0113d3b5d6f
Author: Sergey Sharybin
Date:   Wed Jul 19 16:26:22 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBe29c54674cec166c079fbdf8cb63e0113d3b5d6f

Depsgraph: Fix strict compiler error with copy on write disabled

===================================================================

M	source/blender/depsgraph/intern/builder/deg_builder_nodes.h

===================================================================

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index 9a3cc60d3c8..8be5f85ab13 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@ -82,7 +82,7 @@ struct DepsgraphNodeBuilder {
 #ifdef WITH_COPY_ON_WRITE
 		return (T *)cow->id.newid;
 #else
-		return cow;
+		return (T *)cow;
 #endif
 	}




More information about the Bf-blender-cvs mailing list