diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-25 19:25:28 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-10-25 19:25:28 +0400 |
| commit | 85d9ba5cbb8d98acd13fd8fe294db00af5d3bdae (patch) | |
| tree | 8d8d22578034d0123ab655a329b7f4dfd5e962e6 /source/blender/gpu/intern/gpu_codegen.h | |
| parent | e0a4ca00ac289152b5b9dd125cad514d2cd7bbdd (diff) | |
Fix issue after commit 50282: float texture painting non-color data textures did
not do correct partial updates, now it remembers if the opengl texture is a
non-color data texture or not and takes that into account for the update.
Also includes some renaming ncd => is_data for consistency with color space
terminology used elsewhere.
Diffstat (limited to 'source/blender/gpu/intern/gpu_codegen.h')
| -rw-r--r-- | source/blender/gpu/intern/gpu_codegen.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h index 42e87532e26..f61f34908c5 100644 --- a/source/blender/gpu/intern/gpu_codegen.h +++ b/source/blender/gpu/intern/gpu_codegen.h @@ -91,7 +91,7 @@ struct GPUNodeLink { const char *attribname; int image; - int imagencd; + int image_isdata; int texture; int texturesize; @@ -138,7 +138,7 @@ typedef struct GPUInput { struct Image *ima; /* image */ struct ImageUser *iuser;/* image user */ - int imagencd; /* image does not contain color data */ + int image_isdata; /* image does not contain color data */ float *dynamicvec; /* vector data in case it is dynamic */ int dynamictype; /* origin of the dynamic uniform (GPUDynamicType) */ void *dynamicdata; /* data source of the dynamic uniform */ |