Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop

1 files changed, 3 insertions, 2 deletions

diff --git a/src/raylib.h b/src/raylib.h
index a0cfc7a0..fac6a55f 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -414,12 +414,12 @@ typedef struct Material {
     Texture2D texNormal;        // Normal texture   (binded to shader mapTexture1Loc)
     Texture2D texSpecular;      // Specular texture (binded to shader mapTexture2Loc)
     
+    Color colTint;              // Tint color
     Color colDiffuse;           // Diffuse color
     Color colAmbient;           // Ambient color
     Color colSpecular;          // Specular color
     
     float glossiness;           // Glossiness level (Ranges from 0 to 1000)
-    float normalDepth;          // Normal map depth
 } Material;
 
 // Model type
@@ -437,7 +437,7 @@ typedef struct LightData {
     
     Vector3 position;
     Vector3 target;     // Used on LIGHT_DIRECTIONAL and LIGHT_SPOT (cone direction target)
-    float attenuation;  // Lost of light intensity with distance (world distance)
+    float radius;       // Lost of light intensity with distance (world distance)
     
     Color diffuse;      // Light color
     float intensity;    // Light intensity level
@@ -803,6 +803,7 @@ const char *SubText(const char *text, int position, int length);
 // Basic 3d Shapes Drawing Functions (Module: models)
 //------------------------------------------------------------------------------------
 void Draw3DLine(Vector3 startPos, Vector3 endPos, Color color);                                    // Draw a line in 3D world space
+void Draw3DCircle(Vector3 center, float radius, float rotationAngle, Vector3 rotation, Color color);    // Draw a circle in 3D world space
 void DrawCube(Vector3 position, float width, float height, float lenght, Color color);             // Draw cube
 void DrawCubeV(Vector3 position, Vector3 size, Color color);                                       // Draw cube (Vector version)
 void DrawCubeWires(Vector3 position, float width, float height, float lenght, Color color);        // Draw cube wires