[Bf-blender-cvs] [b4df509f7bb] master: Cleanup: GPUMaterial: Remove unused struct members
Clément Foucault
noreply at git.blender.org
Thu May 30 16:13:30 CEST 2019
Commit: b4df509f7bb8fcf82b2df8e30c8177c9917adab2
Author: Clément Foucault
Date: Thu May 30 14:36:43 2019 +0200
Branches: master
https://developer.blender.org/rBb4df509f7bb8fcf82b2df8e30c8177c9917adab2
Cleanup: GPUMaterial: Remove unused struct members
===================================================================
M source/blender/gpu/intern/gpu_material.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index f5051a1d767..f3df10af518 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -77,25 +77,9 @@ struct GPUMaterial {
ListBase inputs; /* GPUInput */
GPUVertAttrLayers attrs;
int builtins;
- int alpha, obcolalpha;
- int dynproperty;
-
- /* for passing uniforms */
- int viewmatloc, invviewmatloc;
- int obmatloc, invobmatloc;
- int localtoviewmatloc, invlocaltoviewmatloc;
- int obcolloc, obautobumpscaleloc;
- int cameratexcofacloc;
-
- int partscalarpropsloc;
- int partcoloc;
- int partvel;
- int partangvel;
-
- int objectinfoloc;
/* XXX: Should be in Material. But it depends on the output node
- * used and since the output selection is difference for GPUMaterial...
+ * used and since the output selection is different for GPUMaterial...
*/
int domain;
More information about the Bf-blender-cvs
mailing list