Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-07-17 22:39:01 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-07-17 22:39:01 +0300
commit7b30e2386bea9a085f91e5454a5cc3a451d0b249 (patch)
treeee4b8c8961fff891839c055aa430f310dabaf1c4 /source/blender/gpu
parentb45749727ccc70f6155f7acfd4f7acc2c242d277 (diff)
Only use material callback when enabled
Vert/Face select in painting modes weren't drawing after recent changes.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/intern/gpu_draw.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index 79f92b76fe2..04441fc1b20 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -1407,7 +1407,9 @@ static struct GPUMaterialState {
GPUMaterialFixed (*matbuf);
GPUMaterialFixed matbuf_fixed[FIXEDMAT];
int totmat;
- /* set when called inside GPU_begin_object_materials / GPU_end_object_materials */
+
+ /* set when called inside GPU_begin_object_materials / GPU_end_object_materials
+ * otherwise calling GPU_enable_material returns zero */
bool is_enabled;
Material **gmatbuf;