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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-12-10 17:09:46 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-12-10 17:11:57 +0300
commitc2b0d8b6d6c771da70b8fd9da5ac9cc53d04184d (patch)
treef8d0db99e875b9f56c067e894b6c5f130f50b816 /source/blender/gpu/intern/gpu_shader.c
parentfc52d51d73844397b4410ced48448b496403953e (diff)
Fix T57633: Particle texture update problem
Textures are now hooked up to the RESET operation of particle settings, which ensures particles being re-distributed when texture is changed. This is limited to a direct user modifications, which matches old behavior in 2.79.
Diffstat (limited to 'source/blender/gpu/intern/gpu_shader.c')
-rw-r--r--source/blender/gpu/intern/gpu_shader.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 5aec6b17218..00646223793 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -358,7 +358,7 @@ GPUShader *GPU_shader_create_ex(
#endif
/* At least a vertex shader and a fragment shader are required. */
- BLI_assert((fragcode != NULL) && (vertexcode != NULL));
+ // BLI_assert((fragcode != NULL) && (vertexcode != NULL));
if (vertexcode)
shader->vertex = glCreateShader(GL_VERTEX_SHADER);