diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2015-05-12 09:05:04 +0300 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2015-05-12 09:05:04 +0300 |
| commit | 8478c71a7b8f75dcf4855747347ba53639e6aac3 (patch) | |
| tree | f86f474911c55a050bfe73da8acdd5d83bd16685 /source/gameengine/Ketsji/KX_IpoConvert.cpp | |
| parent | ce504cffad49da80aff5b18d0f59d42998e3a9f7 (diff) | |
BGE: Adding material IPO support to GLSL materials
Most of this patch was created by Daniel Stokes, I'm mostly just cleaning
it up and testing it. Still todo: hardness. I need to figure out how to
handle the integer -> float conversion on a dynamic uniform.
Reviewers: psy-fi, brecht
Reviewed By: psy-fi
Subscribers: psy-fi
Differential Revision: https://developer.blender.org/D511
Diffstat (limited to 'source/gameengine/Ketsji/KX_IpoConvert.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_IpoConvert.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_IpoConvert.cpp b/source/gameengine/Ketsji/KX_IpoConvert.cpp index 441c16176aa..7b00760ee7b 100644 --- a/source/gameengine/Ketsji/KX_IpoConvert.cpp +++ b/source/gameengine/Ketsji/KX_IpoConvert.cpp @@ -396,7 +396,7 @@ SG_Controller *BL_CreateMaterialIpo( ipocontr->AddInterpolator(interpolator); } - if ((sinterp = adtList->GetScalarInterpolator("specularity", 0))) { + if ((sinterp = adtList->GetScalarInterpolator("specular_intensity", 0))) { if (!ipocontr) { ipocontr = new KX_MaterialIpoController(matname_hash); } @@ -404,7 +404,7 @@ SG_Controller *BL_CreateMaterialIpo( ipocontr->AddInterpolator(interpolator); } - if ((sinterp = adtList->GetScalarInterpolator("diffuse_reflection", 0))) { + if ((sinterp = adtList->GetScalarInterpolator("diffuse_intensity", 0))) { if (!ipocontr) { ipocontr = new KX_MaterialIpoController(matname_hash); } |