9 лет назад · 6fde222bb2
--- a/Data/Editor/GUISkin.asset
+++ b/Data/Editor/GUISkin.asset
--- a/Data/Editor/Icons/Sprites/sprite_AnimationClipIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_AnimationClipIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_AnimationClipIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_AnimationClipIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_AnimationClipIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_AnimationClipIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_AudioClipIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_AudioClipIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_AudioClipIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_AudioClipIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_AudioClipIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_AudioClipIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_CSharpIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_CSharpIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_CSharpIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_CSharpIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_CSharpIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_CSharpIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_FolderIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_FolderIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_FolderIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_FolderIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_FolderIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_FolderIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_FontIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_FontIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_FontIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_FontIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_FontIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_FontIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_GUISkinIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_GUISkinIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_GUISkinIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_GUISkinIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_GUISkinIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_GUISkinIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_MaterialIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_MaterialIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_MaterialIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_MaterialIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_MaterialIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_MaterialIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_MeshIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_MeshIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_MeshIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_MeshIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_MeshIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_MeshIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_PhysicsMaterialIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_PhysicsMaterialIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_PhysicsMaterialIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_PhysicsMaterialIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_PhysicsMaterialIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_PhysicsMaterialIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_PhysicsMeshIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_PhysicsMeshIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_PhysicsMeshIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_PhysicsMeshIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_PhysicsMeshIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_PhysicsMeshIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_PrefabIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_PrefabIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_PrefabIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_PrefabIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_PrefabIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_PrefabIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_ShaderIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_ShaderIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_ShaderIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_ShaderIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_ShaderIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_ShaderIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_ShaderIncludeIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_ShaderIncludeIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_ShaderIncludeIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_ShaderIncludeIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_ShaderIncludeIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_ShaderIncludeIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_SpriteIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_SpriteIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_SpriteIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_SpriteIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_SpriteIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_SpriteIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_TextIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_TextIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_TextIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_TextIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_TextIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_TextIcon.psd48.asset
--- a/Data/Editor/Icons/Sprites/sprite_TextureIcon.psd16.asset
+++ b/Data/Editor/Icons/Sprites/sprite_TextureIcon.psd16.asset
--- a/Data/Editor/Icons/Sprites/sprite_TextureIcon.psd32.asset
+++ b/Data/Editor/Icons/Sprites/sprite_TextureIcon.psd32.asset
--- a/Data/Editor/Icons/Sprites/sprite_TextureIcon.psd48.asset
+++ b/Data/Editor/Icons/Sprites/sprite_TextureIcon.psd48.asset
--- a/Data/Editor/ResourceManifest.asset
+++ b/Data/Editor/ResourceManifest.asset
--- a/Data/Editor/Shaders/Selection.bsl.asset
+++ b/Data/Editor/Shaders/Selection.bsl.asset
--- a/Data/Editor/Timestamp.asset
+++ b/Data/Editor/Timestamp.asset
--- a/Data/Editor/arial.ttf.asset
+++ b/Data/Editor/arial.ttf.asset
--- a/Data/Editor/arialAA.ttf.asset
+++ b/Data/Editor/arialAA.ttf.asset
--- a/Data/Engine/GUISkin.asset
+++ b/Data/Engine/GUISkin.asset
--- a/Data/Engine/ResourceManifest.asset
+++ b/Data/Engine/ResourceManifest.asset
--- a/Data/Engine/Shaders/Default.bsl.asset
+++ b/Data/Engine/Shaders/Default.bsl.asset
--- a/Data/Engine/Shaders/DeferredPointLightPassIn.bsl.asset
+++ b/Data/Engine/Shaders/DeferredPointLightPassIn.bsl.asset
--- a/Data/Engine/Shaders/Diffuse.bsl.asset
+++ b/Data/Engine/Shaders/Diffuse.bsl.asset
--- a/Data/Engine/Shaders/Resolve.bsl.asset
+++ b/Data/Engine/Shaders/Resolve.bsl.asset
--- a/Data/Engine/Timestamp.asset
+++ b/Data/Engine/Timestamp.asset
--- a/Data/Engine/arial.ttf.asset
+++ b/Data/Engine/arial.ttf.asset
--- a/Documentation/Doxygen/SmallLogoRound.png
+++ b/Documentation/Doxygen/SmallLogoRound.png
--- a/Documentation/Doxygen/doxystyle.css
+++ b/Documentation/Doxygen/doxystyle.css
@@ -44,7 +44,7 @@ div.contents {
 
															 /* Nav bar */
														
 
															 .tabs, .tabs2, .tabs3 {
														
 
															-	background-color: rgba(0, 0, 0, 0.12);
														
 
															+	background-color: rgba(0, 0, 0, 0.8);
														
 
															 	background-image: none;
														
 
															     font-family: Lato,'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
														
 
															 	border-bottom: none;
														
@@ -58,7 +58,7 @@ div.contents {
 
															 .tablist a {
														
 
															 	background-image: none;
														
 
															-	color: rgba(0, 0, 0, 0.58);
														
 
															+	color: rgba(255, 255, 255, 1.0);
														
 
															 	background: transparent;
														
 
															 	text-shadow: none;
														
 
															 	font-weight: bold;
														
@@ -66,14 +66,13 @@ div.contents {
 
															 .tablist a:hover {
														
 
															     background-image: none;
														
 
															-	color: rgba(0, 0, 0, 0.58);
														
 
															+	color: rgba(255, 255, 255, 1.0);
														
 
															 	text-shadow: none;
														
 
															 }
														
 
															 .tablist li.current a {
														
 
															     background-image: none;
														
 
															 	text-shadow: none;
														
 
															-	color: rgba(0, 0, 0, 0.58);
														
 
															 }
														
 
															 .tablist li:hover {
														
@@ -228,6 +227,7 @@ div.toc {
 
															 .icon {
														
 
															 	background-color: transparent;
														
 
															+	color: inherit;
														
 
															 }
														
 
															 table.directory {
														
@@ -301,6 +301,24 @@ dl.note {
 
															 	border-color: rgba(89, 160, 195, 0.86);
														
 
															 }
														
 
															+#menuSegment {
														
 
															+    padding: 0;
														
 
															+    border-bottom: 5px solid #ffb028;
														
 
															+}
														
 
															+
														
 
															+#footerSegment {
														
 
															+    border-top: 5px solid #ffb028;
														
 
															+}
														
 
															+
														
 
															+#logoItem {
														
 
															+    padding-bottom: 0px;
														
 
															+    padding-top: 3px;
														
 
															+}
														
 
															+
														
 
															+#logo {
														
 
															+    width: 55px;
														
 
															+}
														
 
															+
														
 
															 #projectname
														
 
															 {
														
 
															 	font: 300% Lato, Tahoma, Arial,sans-serif;
														
--- a/Documentation/Doxygen/footer.html
+++ b/Documentation/Doxygen/footer.html
@@ -1,22 +1,22 @@
 
															 <!-- HTML footer for doxygen 1.8.10-->
														
 
															 <!-- start footer part -->
														
 
															-	<div class="footer">
														
 
															-    <div class="ui inverted vertical footer segment">
														
 
															+    <!-- Footer -->
														
 
															+    <div class="footer">
														
 
															+    <div class="ui inverted vertical footer segment" id="footerSegment">
														
 
															         <div class="ui container">
														
 
															             <div class="ui stackable inverted divided equal height grid">
														
 
															                 <div class="three wide column">
														
 
															-                    <h4 class="ui inverted header">About</h4>
														
 
															+                    <h4 class="ui inverted header">Contact</h4>
														
 
															                     <div class="ui inverted link list">
														
 
															                         <a href="http://www.banshee3d.com/contact-us" class="item">Contact us</a>
														
 
															                         <a href="https://github.com/BearishSun/BansheeEngine/issues" target="_blank" class="item">Report an issue</a>
														
 
															-                        <a href="http://www.banshee3d.com/support" class="item">Support us</a>
														
 
															                     </div>
														
 
															                 </div>
														
 
															                 <div class="three wide column">
														
 
															                     <h4 class="ui inverted header">Info</h4>
														
 
															                     <div class="ui inverted link list">
														
 
															-                        <a href="http://docs.banshee3d.com/Native" class="item">C++ API documentation</a>
														
 
															-                        <a href="http://docs.banshee3d.com/Managed" class="item">C# API documentation</a>
														
 
															+                        <a href="http://www.banshee3d.com/contribute" class="item">Contribute</a>
														
 
															+                        <a href="http://www.banshee3d.com/development-state" class="item">Development state</a>
														
 
															                         <a href="https://github.com/BearishSun/BansheeEngine/blob/master/Documentation/GitHub/roadmap.md" target="_blank" class="item">Roadmap</a>
														
 
															                         <a href="https://github.com/BearishSun/BansheeEngine/blob/master/Documentation/GitHub/license.md" target="_blank" class="item">License</a>
														
 
															                     </div>
														
--- a/Documentation/Doxygen/header.html
+++ b/Documentation/Doxygen/header.html
@@ -22,19 +22,18 @@ $extrastylesheet
 
															 </head>
														
 
															 <body>
														
 
															 <div class="everything">
														
 
															-	<div class="ui inverted vertical masthead center aligned segment">
														
 
															-		<div class="ui container">
														
 
															-			<div class="ui inverted mainmenu menu">
														
 
															-				<div class="item"><img src="$relpath^SmallLogoRound.png"></div>
														
 
															-				<a class="item" href="http://www.banshee3d.com"><i class="home icon"></i>Home</a>
														
 
															-				<a class="item" href="http://www.banshee3d.com/news"><i class="newspaper icon"></i>News</a>
														
 
															-				<a class="item" href="http://www.banshee3d.com/features"><i class="grid layout icon"></i>Features</a>
														
 
															-				<a class="item" href="http://www.banshee3d.com/support"><i class="users icon"></i>Support Us</a>
														
 
															-				<a class="active item" href="http://www.banshee3d.com/docs"><i class="idea icon"></i>Docs</a>
														
 
															-				<a class="item" href="http://www.banshee3d.com/download"><i class="download icon"></i>Download</a>
														
 
															-			</div>
														
 
															+	<div class="ui inverted vertical center aligned segment" id="menuSegment">
														
 
															+    <div class="ui container">
														
 
															+        <div class="ui inverted mainmenu menu">
														
 
															+            <a href="http://www.banshee3d.com"><div class="item" id="logoItem"><img class="ui mini image" id="logo" src="$relpath^SmallLogoRound.png"></div></a>
														
 
															+			<a class="active item" href="http://www.banshee3d.com"><i class="home icon"></i>Home</a>
														
 
															+			<a class="item" href="http://www.banshee3d.com/news"><i class="newspaper icon"></i>News</a>
														
 
															+			<a class="item" href="http://www.banshee3d.com/features"><i class="grid layout icon"></i>Features</a>
														
 
															+			<a class="item" href="http://www.banshee3d.com/download"><i class="download icon"></i>Download</a>
														
 
															+			<a class="item" href="http://www.banshee3d.com/docs"><i class="idea icon"></i>Docs</a>
														
 
															 		</div>
														
 
															 	</div>
														
 
															+	</div>
														
 
															 	<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
														
--- a/Documentation/GitHub/features.md
+++ b/Documentation/GitHub/features.md
@@ -36,6 +36,19 @@ All features listed here are the ones currently available (implemented). If you
 
															   * Supports texture atlases

														
 
															   * Supports arbitrary 3D transformations

														
 
															   * Localization support (string tables)

														
 
															+* __Animation__

														
 
															+  * Skeletal animation with skinning

														
 
															+    * 1D and 2D animation blending

														
 
															+    * Additive animation support

														
 
															+    * Animation events

														
 
															+    * Root bone animation

														
 
															+    * Animation sockets for animating in-game objects

														
 
															+    * Post-processing hooks for IK support

														
 
															+  * Blend shape animation

														
 
															+  * Generic property animation

														
 
															+    * Animate any script property

														
 
															+    * Built-in animation curve editor

														
 
															+  * Multi-threaded and GPU accelerated

														
 
															 * __Input__

														
 
															   * Mouse/keyboard/gamepad support

														
 
															   * Provides both raw and OS input

														
--- a/Documentation/GitHub/roadmap.md
+++ b/Documentation/GitHub/roadmap.md
@@ -1,19 +1,11 @@
 
															 # Roadmap

														
 
															-The focus right now is to implement the most critical missing features:

														
 
															- - Animation (skeletal, blend shapes, generic script variables)

														
 
															-

														
 
															-Planned for Q3 2016 release.

														
 
															-

														
 
															----------------------------------------------------

														
 
															-

														
 
															-Quickly to follow will be:

														
 
															- - Ports for Linux & Mac

														
 
															- - Vulkan (and possibly DX12) implementation

														
 
															+We are currently focusing on finish up a final set of features before releasing 1.0 stable. These features are:

														
 
															+ - Vulkan implementation

														
 
															  - Physically based renderer

														
 
															- - Website for the community

														
 
															- 

														
 
															-Planned for Q2 2017 release (Version 1.0 beta).

														
 
															+ - Linux/Mac ports

														
 
															+

														
 
															+Planned for Q2 2017 release

														
 
															 ---------------------------------------------------

														
@@ -35,6 +27,7 @@ There are many more features planned, but these are without a specific timeline
 
															  - Level of detail

														
 
															  - XBONE/PS4 ports

														
 
															  - BSP brushes for level prototyping

														
 
															+ - Offline lightmapper

														
 
															  - And more to be decided later...

														
 
															 Implementation times for each of those roughly ranges from 1-4 months.

														
--- a/Documentation/Manuals/Native/materials.md
+++ b/Documentation/Manuals/Native/materials.md
@@ -187,7 +187,7 @@ From the simulation thread you cannot use material to render manually (you must
 
															 Core thread gives you more flexibility and you can use @ref BansheeEngine::RendererUtility::setPass "RendererUtility::setPass" to bind a specific pass from a material to the pipeline, and @ref BansheeEngine::RendererUtility::setPassParams "RendererUtility::setPassParams" to bind material parameters for a specific pass. 
														
 
															-In order to retrieve a set of per-program @ref BansheeEngine::RendererUtility::GpuParams "GpuParams" that can be used for binding directly to the pipeline, call @ref BansheeEngine::Material::createParamsSet "Material::createParamsSet", followed by @ref BansheeEngine::Material::updateParamsSet "Material::updateParamsSet". You are required to call @ref BansheeEngine::Material::updateParamsSet "Material::updateParamsSet" whenever material parameters change, in order to transfer the new data to @ref BansheeEngine::RendererUtility::GpuParams "GpuParams".
														
 
															+In order to retrieve a set of per-program @ref BansheeEngine::GpuParams "GpuParams" that can be used for binding directly to the pipeline, call @ref BansheeEngine::Material::createParamsSet "Material::createParamsSet", followed by @ref BansheeEngine::Material::updateParamsSet "Material::updateParamsSet". You are required to call @ref BansheeEngine::Material::updateParamsSet "Material::updateParamsSet" whenever material parameters change, in order to transfer the new data to @ref BansheeEngine::GpuParams "GpuParams".
														
 
															 After pass and pass parameters are bound you can follow them with draw calls as described in the [render API](@ref renderAPI) manual to render objects manually. 
														
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
															 # What is Banshee? 

														
 
															-A high quality modern game development toolkit. It provides a **high performance multi-threaded game engine** written in C++14 that runs 2D and 3D games. The engine offers a wide variety of high level systems needed for game development, ranging from math and utility libraries, to DirectX 11 and OpenGL support all the way to input, GUI, physics, audio, scripting and support for many popular resource formats (e.g. FBX, PNG, PSD, TTF, OGG, WAV).

														
 
															+A high quality modern game development toolkit. It provides a **high performance multi-threaded game engine** written in C++14 that runs 2D and 3D games. The engine offers a wide variety of high level systems needed for game development, ranging from math and utility libraries, to DirectX 11 and OpenGL support all the way to input, GUI, physics, audio, animation, scripting and support for many popular resource formats (e.g. FBX, PNG, PSD, TTF, OGG, WAV).

														
 
															 On top of the engine Banshee also provides a highly intuitive and customizable **editor** that is easy to use by artists, designers and programmers alike. The editor allows you to manage all your project's assets, build levels, compile scripts, test and publish your game. Editor is also fully extensible via scripting to ensure developers can easily customize it for the exact needs of their projects.

														
--- a/Source/BansheeCore/Include/BsAnimationCurve.h
+++ b/Source/BansheeCore/Include/BsAnimationCurve.h
@@ -39,7 +39,7 @@ namespace BansheeEngine
 
															 		 * happens sequential order (which should be true for most curves). If evaluation is not happening in sequential
														
 
															 		 * order using the non-caching version of evaluate() might yield better performance.
														
 
															 		 *
														
 
															-		 * @param[in]	time			Time to evaluate the curve at.
														
 
															+		 * @param[in]	time			%Time to evaluate the curve at.
														
 
															 		 * @param[in]	cache			Cached data from previous requests that can be used for speeding up sequential calls
														
 
															 		 *								to this method. Caller should ensure to maintain a persistent instance of this data
														
 
															 		 *								for every animation using this curve in order to ensure cache is maintained.
														
@@ -53,7 +53,7 @@ namespace BansheeEngine
 
															 		 * Evaluate the animation curve at the specified time. If evaluating multiple values in a sequential order consider
														
 
															 		 * using the cached version of evaluate() for better performance.
														
 
															 		 *
														
 
															-		 * @param[in]	time	Time to evaluate the curve at.		
														
 
															+		 * @param[in]	time	%Time to evaluate the curve at.		
														
 
															 		 * @param[in]	loop	If true the curve will loop when it goes past the end or beggining. Otherwise the curve 
														
 
															 		 *						value will be clamped.
														
 
															 		 * @return				Interpolated value from the curve at provided time.
														
@@ -64,7 +64,7 @@ namespace BansheeEngine
 
															 		 * Evaluate the animation curve at the specified time and returns a new keyframe containing the evaluated value
														
 
															 		 * and tangents.
														
 
															 		 *
														
 
															-		 * @param[in]	time	Time to evaluate the curve at.		
														
 
															+		 * @param[in]	time	%Time to evaluate the curve at.		
														
 
															 		 * @param[in]	loop	If true the curve will loop when it goes past the end or beggining. Otherwise the curve 
														
 
															 		 *						value will be clamped.
														
 
															 		 * @return				Keyframe containing the interpolated value and tangents at provided time.
														
--- a/Source/BansheeCore/Include/BsMaterial.h
+++ b/Source/BansheeCore/Include/BsMaterial.h
@@ -639,7 +639,10 @@ namespace BansheeEngine
 
															 		 *  @{

														
 
															 		 */

														
 
															-		/** @copydoc CoreObject::markCoreDirty */

														
 
															+		/** 

														
 
															+		 * Marks the core data as dirty. This causes the syncToCore() method to trigger the next time objects are synced 

														
 
															+		 * between core and sim threads. 

														
 
															+		 */

														
 
															 		void _markCoreDirty() override;

														
 
															 		/** @} */

														
--- a/Source/BansheeCore/Include/BsMaterialParams.h
+++ b/Source/BansheeCore/Include/BsMaterialParams.h
@@ -556,7 +556,7 @@ namespace BansheeEngine
 
															 		/** Initializes the core thread version of MaterialParams from its sim thread counterpart. */

														
 
															 		MaterialParamsCore(const SPtr<ShaderCore>& shader, const SPtr<MaterialParams>& params);

														
 
															-		/** @copydoc TMaterialParams<Core>::TMaterialParams */

														
 
															+		/** @copydoc TMaterialParams::TMaterialParams(const ShaderType&) */

														
 
															 		MaterialParamsCore(const SPtr<ShaderCore>& shader);

														
 
															 		/** 

														
@@ -587,7 +587,7 @@ namespace BansheeEngine
 
															 	class BS_CORE_EXPORT MaterialParams : public IReflectable, public TMaterialParams<false>

														
 
															 	{

														
 
															 	public:

														
 
															-		/** @copydoc TMaterialParams<Core>::TMaterialParams */

														
 
															+		/** @copydoc TMaterialParams::TMaterialParams(const ShaderType&) */

														
 
															 		MaterialParams(const HShader& shader);

														
 
															 		/** 

														
--- a/Source/BansheeCore/Source/BsAnimation.cpp
+++ b/Source/BansheeCore/Source/BsAnimation.cpp
@@ -683,7 +683,11 @@ namespace BansheeEngine
 
															 			numChannels = 0;
														
 
															 		mMorphChannelWeights.assign(numChannels, 0.0f);
														
 
															+		if (numChannels > 0)
														
 
															+			mMorphChannelWeights[0] = 1.0f;
														
 
															+
														
 
															 		mDirty |= AnimDirtyStateFlag::Layout;
														
 
															+		mDirty |= AnimDirtyStateFlag::MorphWeights;
														
 
															 	}
														
 
															 	void Animation::setMorphChannelWeight(UINT32 idx, float weight)
														
@@ -1296,8 +1300,9 @@ namespace BansheeEngine
 
															 				didFullRebuild = true;
														
 
															 			}
														
 
															 			else if(mDirty.isSet(AnimDirtyStateFlag::Value))
														
 
															+				mAnimProxy->updateClipInfos(mClipInfos);
														
 
															-			if (mDirty.isSet(AnimDirtyStateFlag::MorphWeights))
														
 
															+			if (mDirty.isSet(AnimDirtyStateFlag::MorphWeights) || didFullRebuild)
														
 
															 				mAnimProxy->updateMorphChannelWeights(mMorphChannelWeights);
														
 
															 		}
														
--- a/Source/BansheeCore/Source/BsAnimationClip.cpp
+++ b/Source/BansheeCore/Source/BsAnimationClip.cpp
@@ -167,7 +167,7 @@ namespace BansheeEngine
 
															 				if (iterFind == mNameMapping.end())
														
 
															 				{
														
 
															 					UINT32* indices = mNameMapping[entry.name];
														
 
															-					memset(indices, -1, sizeof(UINT32) * 4);
														
 
															+					memset(indices, -1, sizeof(UINT32) * (int)CurveType::Count);
														
 
															 					indices[typeIdx] = i;
														
 
															 				}
														
@@ -199,7 +199,7 @@ namespace BansheeEngine
 
															 				if (iterFind == mNameMapping.end())
														
 
															 				{
														
 
															 					UINT32* indices = mNameMapping[entry.name];
														
 
															-					memset(indices, -1, sizeof(UINT32) * 4);
														
 
															+					memset(indices, -1, sizeof(UINT32) * (int)CurveType::Count);
														
 
															 					indices[typeIdx] = i;
														
 
															 				}
														
--- a/Source/BansheeCore/Source/BsAnimationCurve.cpp
+++ b/Source/BansheeCore/Source/BsAnimationCurve.cpp
@@ -179,17 +179,12 @@ namespace BansheeEngine
 
															 #endif
														
 
															 		if (keyframes.size() > 0)
														
 
															-		{
														
 
															-			mStart = keyframes[0].time;
														
 
															 			mEnd = keyframes.back().time;
														
 
															-		}
														
 
															 		else
														
 
															-		{
														
 
															-			mStart = 0.0f;
														
 
															 			mEnd = 0.0f;
														
 
															-		}
														
 
															-		mLength = mEnd - mStart;
														
 
															+		mStart = 0.0f;
														
 
															+		mLength = mEnd;
														
 
															 	}
														
 
															 	template <class T>
														
@@ -202,7 +197,7 @@ namespace BansheeEngine
 
															 			time = 0.0f;
														
 
															 		// Wrap time if looping
														
 
															-		if(loop)
														
 
															+		if(loop && mLength > 0.0f)
														
 
															 		{
														
 
															 			if (time < mStart)
														
 
															 				time = time + (std::floor(mEnd - time) / mLength) * mLength;
														
--- a/Source/BansheeCore/Source/BsAnimationManager.cpp
+++ b/Source/BansheeCore/Source/BsAnimationManager.cpp
@@ -310,7 +310,7 @@ namespace BansheeEngine
 
															 							if (diff > 0.0f)
														
 
															 							{
														
 
															 								float t = -relative / diff;
														
 
															-								shapeInfo.finalWeight = std::min(t, 1.0f);
														
 
															+								shapeInfo.finalWeight = 1.0f - std::min(t, 1.0f);
														
 
															 							}
														
 
															 							else
														
 
															 								shapeInfo.finalWeight = 1.0f;
														
@@ -338,7 +338,7 @@ namespace BansheeEngine
 
															 								if (diff > 0.0f)
														
 
															 								{
														
 
															 									float t = -relative / diff;
														
 
															-									shapeInfo.finalWeight = std::min(t, 1.0f);
														
 
															+									shapeInfo.finalWeight = 1.0f - std::min(t, 1.0f);
														
 
															 								}
														
 
															 								else
														
 
															 									shapeInfo.finalWeight = 1.0f;
														
@@ -349,7 +349,7 @@ namespace BansheeEngine
 
															 								if (diff > 0.0f)
														
 
															 								{
														
 
															 									float t = relative / diff;
														
 
															-									shapeInfo.finalWeight = 1.0f - std::min(t, 1.0f);
														
 
															+									shapeInfo.finalWeight = std::min(t, 1.0f);
														
 
															 								}
														
 
															 								else
														
 
															 									shapeInfo.finalWeight = 0.0f;
														
@@ -369,7 +369,7 @@ namespace BansheeEngine
 
															 								if (diff > 0.0f)
														
 
															 								{
														
 
															 									float t = -relative / diff;
														
 
															-									shapeInfo.finalWeight = std::min(t, 1.0f);
														
 
															+									shapeInfo.finalWeight = 1.0f - std::min(t, 1.0f);
														
 
															 								}
														
 
															 								else
														
 
															 									shapeInfo.finalWeight = 1.0f;
														
--- a/Source/BansheeEditor/Include/BsProjectResourceMeta.h
+++ b/Source/BansheeEditor/Include/BsProjectResourceMeta.h
@@ -92,13 +92,7 @@ namespace BansheeEngine
 
															 		 */
														
 
															 		static SPtr<ProjectFileMeta> create(const SPtr<ImportOptions>& importOptions);
														
 
															-		/** 
														
 
															-		 * Registers a new resource in the file meta-data. 
														
 
															-		 *
														
 
															-		 * @param[in]	resourceMeta	Meta-data to register.
														
 
															-		 * @param[in]	isOld			Set to true if the meta-data doesn't represent a currently active resource, but
														
 
															-		 *								is instead stored in the case the resource gets restored later.
														
 
															-		 */
														
 
															+		/** Registers a new resource in the file meta-data. */
														
 
															 		void add(const SPtr<ProjectResourceMeta>& resourceMeta);
														
 
															 		/** 
														
--- a/Source/BansheeEditor/Source/BsSelectionRenderer.cpp
+++ b/Source/BansheeEditor/Source/BsSelectionRenderer.cpp
@@ -173,6 +173,7 @@ namespace BansheeEngine
 
															 			SPtr<GpuBufferCore> boneMatrixBuffer = renderable->getBoneMatrixBuffer();
														
 
															 			SPtr<VertexBufferCore> morphShapeBuffer = renderable->getMorphShapeBuffer();
														
 
															+			SPtr<VertexDeclarationCore> morphVertexDeclaration = renderable->getMorphVertexDeclaration();
														
 
															 			Matrix4 worldViewProjMat = viewProjMat * renderable->getTransform();
														
 
															 			UINT32 techniqueIdx = mTechniqueIndices[(int)renderable->getAnimType()];
														
@@ -185,10 +186,15 @@ namespace BansheeEngine
 
															 			gRendererUtility().setPassParams(mParams[techniqueIdx], 0);
														
 
															 			UINT32 numSubmeshes = mesh->getProperties().getNumSubMeshes();
														
 
															-			UINT32 renderableId = renderable->getRendererId();
														
 
															-			for(UINT32 i = 0; i < numSubmeshes; i++)
														
 
															-				gRendererUtility().drawMorph(mesh, mesh->getProperties().getSubMesh(i), morphShapeBuffer);
														
 
															+			for (UINT32 i = 0; i < numSubmeshes; i++)
														
 
															+			{
														
 
															+				if (morphVertexDeclaration == nullptr)
														
 
															+					gRendererUtility().draw(mesh, mesh->getProperties().getSubMesh(i));
														
 
															+				else
														
 
															+					gRendererUtility().drawMorph(mesh, mesh->getProperties().getSubMesh(i), morphShapeBuffer,
														
 
															+						morphVertexDeclaration);
														
 
															+			}
														
 
															 		}
														
 
															 	}
														
 
															 }
														
--- a/Source/BansheeEngine/Include/BsGUIScrollBarVert.h
+++ b/Source/BansheeEngine/Include/BsGUIScrollBarVert.h
@@ -29,7 +29,7 @@ namespace BansheeEngine
 
															 		/**
														
 
															 		 * Creates a new vertical scroll bar.
														
 
															 		 *
														
 
															-		 * @param[in]	resizeable		If true the scrollbar will have additional handles that allow the scroll handle to
														
 
															+		 * @param[in]	resizable		If true the scrollbar will have additional handles that allow the scroll handle to
														
 
															 		 *								be resized. This allows you to adjust the size of the visible scroll area.
														
 
															 		 * @param[in]	styleName		Optional style to use for the element. Style will be retrieved from GUISkin of the
														
 
															 		 *								GUIWidget the element is used on. If not specified default style is used.
														
@@ -49,7 +49,7 @@ namespace BansheeEngine
 
															 		/**
														
 
															 		 * Creates a new vertical scroll bar.
														
 
															 		 *
														
 
															-		 * @param[in]	resizeable		If true the scrollbar will have additional handles that allow the scroll handle to
														
 
															+		 * @param[in]	resizable		If true the scrollbar will have additional handles that allow the scroll handle to
														
 
															 		 *								be resized. This allows you to adjust the size of the visible scroll area.
														
 
															 		 * @param[in]	options			Options that allow you to control how is the element positioned and sized.
														
 
															 		 *								This will override any similar options set by style.
														
--- a/Source/BansheeEngine/Include/BsRenderable.h
+++ b/Source/BansheeEngine/Include/BsRenderable.h
@@ -205,6 +205,9 @@ namespace BansheeEngine
 
															 		/** Returns the vertex buffer containing element's morph shape vertices, if it has any. */

														
 
															 		const SPtr<VertexBufferCore>& getMorphShapeBuffer() const { return mMorphShapeBuffer; }

														
 
															+		/** Returns vertex declaration used for rendering meshes containing morph shape information. */

														
 
															+		const SPtr<VertexDeclarationCore>& getMorphVertexDeclaration() const { return mMorphVertexDeclaration; }

														
 
															+

														
 
															 	protected:

														
 
															 		friend class Renderable;

														
@@ -225,6 +228,7 @@ namespace BansheeEngine
 
															 		SPtr<GpuBufferCore> mBoneMatrixBuffer;

														
 
															 		SPtr<VertexBufferCore> mMorphShapeBuffer;

														
 
															+		SPtr<VertexDeclarationCore> mMorphVertexDeclaration;

														
 
															 	};

														
 
															 	/** @copydoc TRenderable */

														
--- a/Source/BansheeEngine/Include/BsRendererUtility.h
+++ b/Source/BansheeEngine/Include/BsRendererUtility.h
@@ -83,14 +83,17 @@ namespace BansheeEngine
 
															 		/**

														
 
															 		 * Draws the specified mesh with an additional vertex buffer containing morph shape vertices.

														
 
															 		 *

														
 
															-		 * @param[in]	mesh			Mesh to draw.

														
 
															-		 * @param[in]	subMesh			Portion of the mesh to draw.

														
 
															-		 * @param[in]	morphVertices	Buffer containing the morph shape vertices. Will be bound to stream 1. Expected

														
 
															-		 *								to contain the same number of vertices as the source mesh.

														
 
															+		 * @param[in]	mesh					Mesh to draw.

														
 
															+		 * @param[in]	subMesh					Portion of the mesh to draw.

														
 
															+		 * @param[in]	morphVertices			Buffer containing the morph shape vertices. Will be bound to stream 1. 

														
 
															+		 *										Expected to contain the same number of vertices as the source mesh.

														
 
															+		 * @param[in]	morphVertexDeclaration	Vertex declaration describing vertices of the provided mesh and the vertices

														
 
															+		 *										provided in the morph vertex buffer.

														
 
															 		 *

														
 
															 		 * @note	Core thread.

														
 
															 		 */

														
 
															-		void drawMorph(const SPtr<MeshCoreBase>& mesh, const SubMesh& subMesh, const SPtr<VertexBufferCore>& morphVertices);

														
 
															+		void drawMorph(const SPtr<MeshCoreBase>& mesh, const SubMesh& subMesh, const SPtr<VertexBufferCore>& morphVertices, 

														
 
															+			const SPtr<VertexDeclarationCore>& morphVertexDeclaration);

														
 
															 		/**

														
 
															 		 * Blits contents of the provided texture into the currently bound render target. If the provided texture contains

														
--- a/Source/BansheeEngine/Source/BsRenderable.cpp
+++ b/Source/BansheeEngine/Source/BsRenderable.cpp
@@ -230,7 +230,7 @@ namespace BansheeEngine
 
															 		{
														
 
															 			SPtr<MorphShapes> morphShapes = mMesh->getMorphShapes();
														
 
															-			UINT32 vertexSize = sizeof(Vector3) + sizeof(Vector4);
														
 
															+			UINT32 vertexSize = sizeof(Vector3) + sizeof(UINT32);
														
 
															 			UINT32 numVertices = morphShapes->getNumVertices();
														
 
															 			SPtr<VertexBufferCore> vertexBuffer = VertexBufferCore::create(vertexSize, numVertices, GBU_DYNAMIC);
														
@@ -339,6 +339,20 @@ namespace BansheeEngine
 
															 		{
														
 
															 			createAnimationBuffers();
														
 
															+			// Create special vertex declaration if using morph shapes
														
 
															+			if (mAnimType == RenderableAnimType::Morph || mAnimType == RenderableAnimType::SkinnedMorph)
														
 
															+			{
														
 
															+				SPtr<VertexDataDesc> vertexDesc = VertexDataDesc::create();
														
 
															+				*vertexDesc = * mMesh->getVertexDesc();
														
 
															+
														
 
															+				vertexDesc->addVertElem(VET_FLOAT3, VES_POSITION, 1, 1);
														
 
															+				vertexDesc->addVertElem(VET_UBYTE4_NORM, VES_NORMAL, 1, 1);
														
 
															+
														
 
															+				mMorphVertexDeclaration = VertexDeclarationCore::create(vertexDesc);
														
 
															+			}
														
 
															+			else
														
 
															+				mMorphVertexDeclaration = nullptr;
														
 
															+
														
 
															 			if (oldIsActive != mIsActive)
														
 
															 			{
														
 
															 				if (mIsActive)
														
--- a/Source/BansheeEngine/Source/BsRendererUtility.cpp
+++ b/Source/BansheeEngine/Source/BsRendererUtility.cpp
@@ -297,13 +297,13 @@ namespace BansheeEngine
 
															 	}

														
 
															 	void RendererUtility::drawMorph(const SPtr<MeshCoreBase>& mesh, const SubMesh& subMesh, 

														
 
															-		const SPtr<VertexBufferCore>& morphVertices)

														
 
															+		const SPtr<VertexBufferCore>& morphVertices, const SPtr<VertexDeclarationCore>& morphVertexDeclaration)

														
 
															 	{

														
 
															 		// Bind buffers and draw

														
 
															 		RenderAPICore& rapi = RenderAPICore::instance();

														
 
															 		SPtr<VertexData> vertexData = mesh->getVertexData();

														
 
															-		rapi.setVertexDeclaration(mesh->getVertexData()->vertexDeclaration); // TODO - Set valid declaration

														
 
															+		rapi.setVertexDeclaration(morphVertexDeclaration);

														
 
															 		auto& meshBuffers = vertexData->getBuffers();

														
 
															 		SPtr<VertexBufferCore> allBuffers[MAX_BOUND_VERTEX_BUFFERS];

														
@@ -319,6 +319,9 @@ namespace BansheeEngine
 
															 			endSlot = std::max(iter->first, endSlot);

														
 
															 		}

														
 
															+		startSlot = std::min(1U, startSlot);

														
 
															+		endSlot = std::max(1U, endSlot);

														
 
															+

														
 
															 		for (auto iter = meshBuffers.begin(); iter != meshBuffers.end(); ++iter)

														
 
															 			allBuffers[iter->first - startSlot] = iter->second;

														
--- a/Source/BansheeFBXImporter/Source/BsFBXImporter.cpp
+++ b/Source/BansheeFBXImporter/Source/BsFBXImporter.cpp
@@ -378,19 +378,25 @@ namespace BansheeEngine
 
															 						{
														
 
															 							for (UINT32 i = 0; i < numVertices; i++)
														
 
															 							{
														
 
															+								Vector3 meshPosition = worldTransform.multiplyAffine(mesh->positions[i]);
														
 
															 								Vector3 blendPosition = worldTransform.multiplyAffine(blendFrame.positions[i]);
														
 
															-								Vector3 positionDelta = blendPosition - mesh->positions[i];
														
 
															+								Vector3 positionDelta = blendPosition - meshPosition;
														
 
															 								Vector3 normalDelta;
														
 
															 								if (hasNormals)
														
 
															 								{
														
 
															-									Vector3 blendNormal = worldTransformIT.multiplyAffine(blendFrame.normals[i]);
														
 
															-									normalDelta = blendNormal - mesh->normals[i];
														
 
															+									Vector3 blendNormal = worldTransformIT.multiplyDirection(blendFrame.normals[i]);
														
 
															+									blendNormal = Vector3::normalize(blendNormal);
														
 
															+
														
 
															+									Vector3 meshNormal = worldTransformIT.multiplyDirection(mesh->normals[i]);
														
 
															+									meshNormal = Vector3::normalize(meshNormal);
														
 
															+
														
 
															+									normalDelta = blendNormal - meshNormal;
														
 
															 								}
														
 
															 								else
														
 
															 									normalDelta = Vector3::ZERO;
														
 
															-								if (positionDelta.squaredLength() > 0.0001f || normalDelta.squaredLength() > 0.01f)
														
 
															+								if (positionDelta.squaredLength() > 0.000001f || normalDelta.squaredLength() > 0.0001f)
														
 
															 									shape.vertices.push_back(MorphVertex(positionDelta, normalDelta, totalNumVertices + i));
														
 
															 							}
														
 
															 						}
														
@@ -509,9 +515,9 @@ namespace BansheeEngine
 
															 			importScale = options.importScale;
														
 
															 		FbxSystemUnit units = scene->GetGlobalSettings().GetSystemUnit();
														
 
															-		FbxSystemUnit bsScaledUnits(100.0f, importScale);
														
 
															+		FbxSystemUnit bsScaledUnits(100.0f);
														
 
															-		outputScene.scaleFactor = (float)units.GetConversionFactorTo(bsScaledUnits);
														
 
															+		outputScene.scaleFactor = (float)units.GetConversionFactorTo(bsScaledUnits) * importScale;
														
 
															 		outputScene.globalScale = Matrix4::scaling(outputScene.scaleFactor);
														
 
															 		outputScene.rootNode = createImportNode(outputScene, scene->GetRootNode(), nullptr);
														
@@ -1337,6 +1343,10 @@ namespace BansheeEngine
 
															 					blendShape.name = channel->GetName();
														
 
															 					blendShape.frames.resize(frameCount);
														
 
															+					// Get name without invalid characters
														
 
															+					blendShape.name = StringUtil::replaceAll(blendShape.name, ".", "_");
														
 
															+					blendShape.name = StringUtil::replaceAll(blendShape.name, "/", "_");
														
 
															+
														
 
															 					for (UINT32 k = 0; k < frameCount; k++)
														
 
															 					{
														
 
															 						FbxShape* fbxShape = channel->GetTargetShape(k);
														
@@ -1344,6 +1354,10 @@ namespace BansheeEngine
 
															 						FBXBlendShapeFrame& frame = blendShape.frames[k];
														
 
															 						frame.name = fbxShape->GetName();
														
 
															 						frame.weight = (float)(weights[k] / 100.0);
														
 
															+
														
 
															+						// Get name without invalid characters
														
 
															+						frame.name = StringUtil::replaceAll(frame.name, ".", "_");
														
 
															+						frame.name = StringUtil::replaceAll(frame.name, "/", "_");
														
 
															 						importBlendShapeFrame(fbxShape, *mesh, options, frame);
														
 
															 					}
														
@@ -1714,6 +1728,10 @@ namespace BansheeEngine
 
															 							FBXBlendShapeAnimation& blendShapeAnim = clip.blendShapeAnimations.back();
														
 
															 							blendShapeAnim.blendShape = channel->GetName();
														
 
															+							// Get name without invalid characters
														
 
															+							blendShapeAnim.blendShape = StringUtil::replaceAll(blendShapeAnim.blendShape, ".", "_");
														
 
															+							blendShapeAnim.blendShape = StringUtil::replaceAll(blendShapeAnim.blendShape, "/", "_");
														
 
															+
														
 
															 							FbxAnimCurve* curves[1] = { curve };
														
 
															 							blendShapeAnim.curve = importCurve<float, 1>(curves, importOptions, clip.start, clip.end);
														
--- a/Source/BansheeSL/Include/BsSLImporter.h
+++ b/Source/BansheeSL/Include/BsSLImporter.h
@@ -22,16 +22,16 @@ namespace BansheeEngine
 
															 		virtual ~SLImporter();

														
 
															 		/** @copydoc SpecificImporter::isExtensionSupported */

														
 
															-		virtual bool isExtensionSupported(const WString& ext) const override;

														
 
															+		bool isExtensionSupported(const WString& ext) const override;

														
 
															 		/** @copydoc SpecificImporter::isMagicNumberSupported */

														
 
															-		virtual bool isMagicNumberSupported(const UINT8* magicNumPtr, UINT32 numBytes) const override;

														
 
															+		bool isMagicNumberSupported(const UINT8* magicNumPtr, UINT32 numBytes) const override;

														
 
															 		/** @copydoc SpecificImporter::import */

														
 
															-		virtual SPtr<Resource> import(const Path& filePath, SPtr<const ImportOptions> importOptions) override;

														
 
															+		SPtr<Resource> import(const Path& filePath, SPtr<const ImportOptions> importOptions) override;

														
 
															 		/** @copydoc SpecificImporter::createImportOptions */

														
 
															-		virtual SPtr<ImportOptions> createImportOptions() const override;

														
 
															+		SPtr<ImportOptions> createImportOptions() const override;

														
 
															 	};

														
 
															 	/** @} */

														
--- a/Source/BansheeSL/Source/BsASTFX.c
+++ b/Source/BansheeSL/Source/BsASTFX.c
@@ -225,8 +225,9 @@ void beginCodeBlock(ParseState* parseState)
 
															 		{

														
 
															 			appendCodeBlock(parseState, " ", 1);

														
 
															 			appendCodeBlock(parseState, parseState->defines[i].expr, (int)strlen(parseState->defines[i].expr));

														
 
															-			appendCodeBlock(parseState, "\n", 1);

														
 
															 		}

														
 
															+

														
 
															+		appendCodeBlock(parseState, "\n", 1);

														
 
															 	}

														
 
															 }

														
--- a/Source/BansheeUtility/Include/BsFlags.h
+++ b/Source/BansheeUtility/Include/BsFlags.h
@@ -267,6 +267,6 @@ namespace BansheeEngine
 
															 		}	
														
 
															 	}; 
														
 
															-	/** @encond */
														
 
															+	/** @endcond */
														
 
															 	/** @} */
														
 
															 }
														
--- a/Source/MBansheeEditor/Windows/Animation/EditorAnimInfo.cs
+++ b/Source/MBansheeEditor/Windows/Animation/EditorAnimInfo.cs
@@ -19,6 +19,7 @@ namespace BansheeEditor
 
															     {
														
 
															         public SerializableProperty.FieldType type;
														
 
															         public CurveDrawInfo[] curveInfos;
														
 
															+        public bool isPropertyCurve;
														
 
															     }
														
 
															     /// <summary>
														
@@ -142,6 +143,7 @@ namespace BansheeEditor
 
															                         FieldAnimCurves fieldCurves = new FieldAnimCurves();
														
 
															                         fieldCurves.type = SerializableProperty.FieldType.Vector3;
														
 
															                         fieldCurves.curveInfos = new CurveDrawInfo[3];
														
 
															+                        fieldCurves.isPropertyCurve = !clipInfo.isImported;
														
 
															                         fieldCurves.curveInfos[0] = new CurveDrawInfo();
														
 
															                         fieldCurves.curveInfos[0].curve = new EdAnimationCurve(curveEntry.X, tangentsX);
														
@@ -249,8 +251,10 @@ namespace BansheeEditor
 
															                         fieldCurves.type = SerializableProperty.FieldType.Color;
														
 
															                 }
														
 
															-                fieldCurves.curveInfos = new CurveDrawInfo[numCurves];
														
 
															+                bool isMorphCurve = false;
														
 
															+                string curvePath = KVP.Key;
														
 
															+                fieldCurves.curveInfos = new CurveDrawInfo[numCurves];
														
 
															                 for (int i = 0; i < numCurves; i++)
														
 
															                 {
														
 
															                     int curveIdx = KVP.Value[i].Item1;
														
@@ -263,9 +267,21 @@ namespace BansheeEditor
 
															                     fieldCurves.curveInfos[i] = new CurveDrawInfo();
														
 
															                     fieldCurves.curveInfos[i].curve = new EdAnimationCurve(clipCurves.FloatCurves[curveIdx].Curve, tangents);
														
 
															                     fieldCurves.curveInfos[i].color = GUICurveDrawing.GetUniqueColor(globalCurveIdx++);
														
 
															+
														
 
															+                    if (clipCurves.FloatCurves[curveIdx].Flags.HasFlag(AnimationCurveFlags.MorphFrame))
														
 
															+                    {
														
 
															+                        curvePath = "MorphShapes/Frames/" + KVP.Key;
														
 
															+                        isMorphCurve = true;
														
 
															+                    }
														
 
															+                    else if (clipCurves.FloatCurves[curveIdx].Flags.HasFlag(AnimationCurveFlags.MorphWeight))
														
 
															+                    {
														
 
															+                        curvePath = "MorphShapes/Weight/" + KVP.Key;
														
 
															+                        isMorphCurve = true;
														
 
															+                    }
														
 
															                 }
														
 
															-                string curvePath = KVP.Key;
														
 
															+                fieldCurves.isPropertyCurve = !clipInfo.isImported && !isMorphCurve;
														
 
															+
														
 
															                 clipInfo.curves[curvePath] = fieldCurves;
														
 
															             }
														
@@ -286,6 +302,28 @@ namespace BansheeEditor
 
															             return ProjectLibrary.IsSubresource(resourcePath);
														
 
															         }
														
 
															+        /// <summary>
														
 
															+        /// Checks does a curve with the specified path represent a curve affecting a morph shape.
														
 
															+        /// </summary>
														
 
															+        /// <param name="path">Path of the curve to check.</param>
														
 
															+        /// <returns>True if morph shape frame or weight animation, false otherwise.</returns>
														
 
															+        public static bool IsMorphShapeCurve(string path)
														
 
															+        {
														
 
															+            if (string.IsNullOrEmpty(path))
														
 
															+                return false;
														
 
															+
														
 
															+            string trimmedPath = path.Trim('/');
														
 
															+            string[] entries = trimmedPath.Split('/');
														
 
															+
														
 
															+            if (entries.Length < 3)
														
 
															+                return false;
														
 
															+
														
 
															+            if (entries[entries.Length - 3] != "MorphShapes")
														
 
															+                return false;
														
 
															+
														
 
															+            return entries[entries.Length - 2] == "Weight" || entries[entries.Length - 2] == "Frames";
														
 
															+        }
														
 
															+
														
 
															         /// <summary>
														
 
															         /// Applies any changes made to the animation curves or events to the actual animation clip. Only works for
														
 
															         /// non-imported animation clips.
														
@@ -357,15 +395,16 @@ namespace BansheeEditor
 
															                 }
														
 
															                 else
														
 
															                 {
														
 
															-                    Action<int, string> addCurve = (idx, subPath) =>
														
 
															+                    Action<int, string, string, AnimationCurveFlags> addCurve = (idx, path, subPath, flags) =>
														
 
															                     {
														
 
															-                        string path = kvp.Key + subPath;
														
 
															+                        string fullPath = path + subPath;
														
 
															-                        NamedFloatCurve curve = new NamedFloatCurve(path,
														
 
															-                        new AnimationCurve(kvp.Value.curveInfos[idx].curve.KeyFrames));
														
 
															+                        NamedFloatCurve curve = new NamedFloatCurve(fullPath,
														
 
															+                            new AnimationCurve(kvp.Value.curveInfos[idx].curve.KeyFrames));
														
 
															+                        curve.Flags = flags;
														
 
															                         EditorFloatCurveTangents curveTangents = new EditorFloatCurveTangents();
														
 
															-                        curveTangents.name = path;
														
 
															+                        curveTangents.name = fullPath;
														
 
															                         curveTangents.tangents = kvp.Value.curveInfos[idx].curve.TangentModes;
														
 
															                         floatCurves.Add(curve);
														
@@ -375,30 +414,50 @@ namespace BansheeEditor
 
															                     switch (kvp.Value.type)
														
 
															                     {
														
 
															                         case SerializableProperty.FieldType.Vector2:
														
 
															-                            addCurve(0, ".x");
														
 
															-                            addCurve(1, ".y");
														
 
															+                            addCurve(0, kvp.Key, ".x", 0);
														
 
															+                            addCurve(1, kvp.Key, ".y", 0);
														
 
															                             break;
														
 
															                         case SerializableProperty.FieldType.Vector3:
														
 
															-                            addCurve(0, ".x");
														
 
															-                            addCurve(1, ".y");
														
 
															-                            addCurve(2, ".z");
														
 
															+                            addCurve(0, kvp.Key, ".x", 0);
														
 
															+                            addCurve(1, kvp.Key, ".y", 0);
														
 
															+                            addCurve(2, kvp.Key, ".z", 0);
														
 
															                             break;
														
 
															                         case SerializableProperty.FieldType.Vector4:
														
 
															-                            addCurve(0, ".x");
														
 
															-                            addCurve(1, ".y");
														
 
															-                            addCurve(2, ".z");
														
 
															-                            addCurve(3, ".w");
														
 
															+                            addCurve(0, kvp.Key, ".x", 0);
														
 
															+                            addCurve(1, kvp.Key, ".y", 0);
														
 
															+                            addCurve(2, kvp.Key, ".z", 0);
														
 
															+                            addCurve(3, kvp.Key, ".w", 0);
														
 
															                             break;
														
 
															                         case SerializableProperty.FieldType.Color:
														
 
															-                            addCurve(0, ".r");
														
 
															-                            addCurve(1, ".g");
														
 
															-                            addCurve(2, ".b");
														
 
															-                            addCurve(3, ".a");
														
 
															+                            addCurve(0, kvp.Key, ".r", 0);
														
 
															+                            addCurve(1, kvp.Key, ".g", 0);
														
 
															+                            addCurve(2, kvp.Key, ".b", 0);
														
 
															+                            addCurve(3, kvp.Key, ".a", 0);
														
 
															                             break;
														
 
															                         case SerializableProperty.FieldType.Bool:
														
 
															                         case SerializableProperty.FieldType.Int:
														
 
															                         case SerializableProperty.FieldType.Float:
														
 
															-                            addCurve(0, "");
														
 
															+                        {
														
 
															+                            AnimationCurveFlags flags = 0;
														
 
															+                            string path = kvp.Key;
														
 
															+
														
 
															+                            if (IsMorphShapeCurve(kvp.Key))
														
 
															+                            {
														
 
															+                                string trimmedPath = path.Trim('/');
														
 
															+                                string[] entries = trimmedPath.Split('/');
														
 
															+
														
 
															+                                bool isWeight = entries[entries.Length - 2] == "Weight";
														
 
															+
														
 
															+                                if (isWeight)
														
 
															+                                    flags = AnimationCurveFlags.MorphWeight;
														
 
															+                                else
														
 
															+                                    flags = AnimationCurveFlags.MorphFrame;
														
 
															+
														
 
															+                                path = entries[entries.Length - 1];
														
 
															+                            }
														
 
															+
														
 
															+                            addCurve(0, path, "", flags);
														
 
															+                        }
														
 
															                             break;
														
 
															                     }
														
 
															                 }
														
--- a/Source/MBansheeEditor/Windows/Animation/GUIAnimFieldDisplay.cs
+++ b/Source/MBansheeEditor/Windows/Animation/GUIAnimFieldDisplay.cs
@@ -195,7 +195,7 @@ namespace BansheeEditor
 
															                     continue;
														
 
															                 bool entryIsMissing;
														
 
															-                if (fieldInfos[i].isUserCurve)
														
 
															+                if (fieldInfos[i].curveGroup.isPropertyCurve)
														
 
															                 {
														
 
															                     string pathSuffix;
														
 
															                     SerializableProperty property = Animation.FindProperty(root, fieldInfos[i].path, out pathSuffix);
														
@@ -299,7 +299,7 @@ namespace BansheeEditor
 
															     /// </summary>
														
 
															     internal abstract class GUIAnimFieldEntry
														
 
															     {
														
 
															-        private const int MAX_PATH_LENGTH = 30;
														
 
															+        private const int MAX_PATH_LENGTH = 20;
														
 
															         protected const int INDENT_AMOUNT = 10;
														
 
															         protected string path;
														
@@ -781,11 +781,11 @@ namespace BansheeEditor
 
															         public GUIAnimMissingEntry(GUIAnimFieldLayouts layouts, string path)
														
 
															             : base(layouts, path, false, 15)
														
 
															         {
														
 
															-            missingLabel = new GUILabel("Missing property!", GUIOption.FixedHeight(GetEntryHeight()));
														
 
															+            missingLabel = new GUILabel("Missing!", GUIOption.FixedHeight(GetEntryHeight()));
														
 
															             underlayLayout = layouts.underlay.AddLayoutX();
														
 
															             underlayLayout.AddFlexibleSpace();
														
 
															             underlayLayout.AddElement(missingLabel);
														
 
															-            underlayLayout.AddSpace(50);
														
 
															+            underlayLayout.AddSpace(15);
														
 
															             overlaySpacing = new GUILabel("", GUIOption.FixedHeight(GetEntryHeight()));
														
 
															             layouts.overlay.AddElement(overlaySpacing);
														
@@ -806,16 +806,14 @@ namespace BansheeEditor
 
															     /// </summary>
														
 
															     internal struct AnimFieldInfo
														
 
															     {
														
 
															-        public AnimFieldInfo(string path, FieldAnimCurves curveGroup, bool isUserCurve)
														
 
															+        public AnimFieldInfo(string path, FieldAnimCurves curveGroup)
														
 
															         {
														
 
															             this.path = path;
														
 
															             this.curveGroup = curveGroup;
														
 
															-            this.isUserCurve = isUserCurve;
														
 
															         }
														
 
															         public string path;
														
 
															         public FieldAnimCurves curveGroup;
														
 
															-        public bool isUserCurve;
														
 
															     }
														
 
															     /** @} */
														
--- a/Source/MBansheeEditor/Windows/Animation/GUIFieldSelector.cs
+++ b/Source/MBansheeEditor/Windows/Animation/GUIFieldSelector.cs
@@ -248,14 +248,11 @@ namespace BansheeEditor
 
															             }
														
 
															             // Handle special fields
														
 
															-            Debug.Log("Type: " + serializableObject.Type);
														
 
															             if (serializableObject.Type == typeof(Animation))
														
 
															             {
														
 
															                 Animation anim = serializableObject.Object as Animation;
														
 
															-                Debug.Log("Anim: " + (anim != null));
														
 
															                 MorphShapes morphShapes = anim?.SceneObject.GetComponent<Renderable>()?.Mesh?.MorphShapes;
														
 
															-                Debug.Log("Shapes: " + (morphShapes != null));
														
 
															                 if (morphShapes != null)
														
 
															                 {
														
 
															                     string propertyPath = parent.path + "/MorphShapes";
														
--- a/Source/MBansheeEditor/Windows/AnimationWindow.cs
+++ b/Source/MBansheeEditor/Windows/AnimationWindow.cs
@@ -710,7 +710,7 @@ namespace BansheeEditor
 
															             persistentData.dirtyAnimClips[clip.UUID] = clipInfo;
														
 
															             foreach (var curve in clipInfo.curves)
														
 
															-                guiFieldDisplay.AddField(new AnimFieldInfo(curve.Key, curve.Value, !clipInfo.isImported));
														
 
															+                guiFieldDisplay.AddField(new AnimFieldInfo(curve.Key, curve.Value));
														
 
															             guiCurveEditor.Events = clipInfo.events;
														
 
															             guiCurveEditor.DisableCurveEdit = clipInfo.isImported;
														
@@ -1346,13 +1346,15 @@ namespace BansheeEditor
 
															         private void AddNewField(string path, SerializableProperty.FieldType type)
														
 
															         {
														
 
															             bool noSelection = selectedFields.Count == 0;
														
 
															-            
														
 
															+            bool isPropertyCurve = !clipInfo.isImported && !EditorAnimClipInfo.IsMorphShapeCurve(path);
														
 
															+
														
 
															             switch (type)
														
 
															             {
														
 
															                 case SerializableProperty.FieldType.Vector4:
														
 
															                     {
														
 
															                         FieldAnimCurves fieldCurves = new FieldAnimCurves();
														
 
															                         fieldCurves.type = type;
														
 
															+                        fieldCurves.isPropertyCurve = isPropertyCurve;
														
 
															                         fieldCurves.curveInfos = new CurveDrawInfo[4];
														
 
															                         string[] subPaths = { ".x", ".y", ".z", ".w" };
														
@@ -1370,6 +1372,7 @@ namespace BansheeEditor
 
															                     {
														
 
															                         FieldAnimCurves fieldCurves = new FieldAnimCurves();
														
 
															                         fieldCurves.type = type;
														
 
															+                        fieldCurves.isPropertyCurve = isPropertyCurve;
														
 
															                         fieldCurves.curveInfos = new CurveDrawInfo[3];
														
 
															                         string[] subPaths = { ".x", ".y", ".z" };
														
@@ -1387,6 +1390,7 @@ namespace BansheeEditor
 
															                     {
														
 
															                         FieldAnimCurves fieldCurves = new FieldAnimCurves();
														
 
															                         fieldCurves.type = type;
														
 
															+                        fieldCurves.isPropertyCurve = isPropertyCurve;
														
 
															                         fieldCurves.curveInfos = new CurveDrawInfo[2];
														
 
															                         string[] subPaths = { ".x", ".y" };
														
@@ -1404,6 +1408,7 @@ namespace BansheeEditor
 
															                     {
														
 
															                         FieldAnimCurves fieldCurves = new FieldAnimCurves();
														
 
															                         fieldCurves.type = type;
														
 
															+                        fieldCurves.isPropertyCurve = isPropertyCurve;
														
 
															                         fieldCurves.curveInfos = new CurveDrawInfo[4];
														
 
															                         string[] subPaths = { ".r", ".g", ".b", ".a" };
														
@@ -1421,6 +1426,7 @@ namespace BansheeEditor
 
															                     {
														
 
															                         FieldAnimCurves fieldCurves = new FieldAnimCurves();
														
 
															                         fieldCurves.type = type;
														
 
															+                        fieldCurves.isPropertyCurve = isPropertyCurve;
														
 
															                         fieldCurves.curveInfos = new CurveDrawInfo[1];
														
 
															                         fieldCurves.curveInfos[0].curve = new EdAnimationCurve();
														
@@ -1484,7 +1490,7 @@ namespace BansheeEditor
 
															         {
														
 
															             List<AnimFieldInfo> existingFields = new List<AnimFieldInfo>();
														
 
															             foreach (var KVP in clipInfo.curves)
														
 
															-                existingFields.Add(new AnimFieldInfo(KVP.Key, KVP.Value, !clipInfo.isImported));
														
 
															+                existingFields.Add(new AnimFieldInfo(KVP.Key, KVP.Value));
														
 
															             guiFieldDisplay.SetFields(existingFields.ToArray());
														
 
															         }
														
--- a/Source/RenderBeast/Include/BsRendererObject.h
+++ b/Source/RenderBeast/Include/BsRendererObject.h
@@ -54,6 +54,9 @@ namespace BansheeEngine
 
															 		/** Vertex buffer containing element's morph shape vertices, if it has any. */
														
 
															 		SPtr<VertexBufferCore> morphShapeBuffer;
														
 
															+		/** Vertex declaration used for rendering meshes containing morph shape information. */
														
 
															+		SPtr<VertexDeclarationCore> morphVertexDeclaration;
														
 
															+
														
 
															 		/** Version of the morph shape vertices in the buffer. */
														
 
															 		mutable UINT32 morphShapeVersion;
														
 
															 	};
														
--- a/Source/RenderBeast/Source/BsRenderBeast.cpp
+++ b/Source/RenderBeast/Source/BsRenderBeast.cpp
@@ -144,6 +144,7 @@ namespace BansheeEngine
 
															 				renElement.morphShapeVersion = 0;

														
 
															 				renElement.morphShapeBuffer = renderable->getMorphShapeBuffer();

														
 
															 				renElement.boneMatrixBuffer = renderable->getBoneMatrixBuffer();

														
 
															+				renElement.morphVertexDeclaration = renderable->getMorphVertexDeclaration();

														
 
															 				renElement.material = renderable->getMaterial(i);

														
 
															 				if (renElement.material == nullptr)

														
@@ -186,11 +187,13 @@ namespace BansheeEngine
 
															 							// If using morph shapes ignore POSITION1 and NORMAL1 missing since we assign them from within the renderer

														
 
															 							if(animType == RenderableAnimType::Morph || animType == RenderableAnimType::SkinnedMorph)

														
 
															 							{

														
 
															-								std::remove_if(missingElements.begin(), missingElements.end(), [](const VertexElement& x)

														
 
															+								auto removeIter = std::remove_if(missingElements.begin(), missingElements.end(), [](const VertexElement& x)

														
 
															 								{

														
 
															 									return (x.getSemantic() == VES_POSITION && x.getSemanticIdx() == 1) ||

														
 
															 										(x.getSemantic() == VES_NORMAL && x.getSemanticIdx() == 1);

														
 
															 								});

														
 
															+

														
 
															+								missingElements.erase(removeIter, missingElements.end());

														
 
															 							}

														
 
															 							if (!missingElements.empty())

														
@@ -835,7 +838,11 @@ namespace BansheeEngine
 
															 		else

														
 
															 			setPassParams(element.params, nullptr, passIdx);

														
 
															-		gRendererUtility().drawMorph(element.mesh, element.subMesh, element.morphShapeBuffer);

														
 
															+		if(element.morphVertexDeclaration == nullptr)

														
 
															+			gRendererUtility().draw(element.mesh, element.subMesh);

														
 
															+		else

														
 
															+			gRendererUtility().drawMorph(element.mesh, element.subMesh, element.morphShapeBuffer, 

														
 
															+				element.morphVertexDeclaration);

														
 
															 	}

														
 
															 	void RenderBeast::refreshSamplerOverrides(bool force)