Commit: 522ad146a03fe5e79af93f41e171f2c6932e3af7
Author: Lukas Tönne
Date: Wed Jul 27 12:22:38 2016 +0200
Branches: strand_nodes
https://developer.blender.org/rB522ad146a03fe5e79af93f41e171f2c6932e3af7
Removed deprecated modifier settings for static hair effects.
===================================================================
M source/blender/editors/space_view3d/drawstrands.c
M source/blender/gpu/GPU_strands.h
M source/blender/gpu/intern/gpu_strands_shader.c
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/modifiers/intern/MOD_strands.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawstrands.c
b/source/blender/editors/space_view3d/drawstrands.c
index 4cab9e4..b7932db 100644
--- a/source/blender/editors/space_view3d/drawstrands.c
+++ b/source/blender/editors/space_view3d/drawstrands.c
@@ -97,8 +97,6 @@ static void bind_strands_shader(GPUStrandsShader *shader,
RegionView3D *rv3d,
GPU_strand_shader_bind_uniforms(shader, ob->obmat, rv3d->viewmat);
GPU_strand_shader_bind(shader, rv3d->viewmat, rv3d->viewinv,
smd->ribbon_width,
- smd->clump_thickness, smd->clump_shape,
- smd->curl_thickness, smd->curl_shape,
smd->curl_radius, smd->curl_length,
debug_value, smd->debug_scale);
}
diff --git a/source/blender/gpu/GPU_strands.h b/source/blender/gpu/GPU_strands.h
index ef7fd97..f8f208b 100644
--- a/source/blender/gpu/GPU_strands.h
+++ b/source/blender/gpu/GPU_strands.h
@@ -70,8 +70,6 @@ void GPU_strand_shader_bind(
GPUStrandsShader *gpu_shader,
float viewmat[4][4], float viewinv[4][4],
float ribbon_width,
- float clump_thickness, float clump_shape,
- float curl_thickness, float curl_shape, float curl_radius, float
curl_length,
int debug_value, float debug_scale);
void GPU_strand_shader_bind_uniforms(
GPUStrandsShader *gpu_shader,
diff --git a/source/blender/gpu/intern/gpu_strands_shader.c
b/source/blender/gpu/intern/gpu_strands_shader.c
index e585af1..62b1499 100644
--- a/source/blender/gpu/intern/gpu_strands_shader.c
+++ b/source/blender/gpu/intern/gpu_strands_shader.c
@@ -320,8 +320,6 @@ void GPU_strand_shader_free(struct GPUStrandsShader
*gpu_shader)
void GPU_strand_shader_bind(GPUStrandsShader *strand_shader,
float viewmat[4][4], float viewinv[4][4],
float ribbon_width,
- float clump_thickness, float clump_shape,
- float curl_thickness, float curl_shape, float
curl_radius, float curl_length,
int debug_value, float debug_scale)
{
GPUShader *shader = (debug_value == 0) ? strand_shader->shader :
strand_shader->debug_shader;
@@ -330,12 +328,6 @@ void GPU_strand_shader_bind(GPUStrandsShader
*strand_shader,
GPU_shader_bind(shader);
glUniform1f(GPU_shader_get_uniform(shader, "ribbon_width"),
ribbon_width);
- glUniform1f(GPU_shader_get_uniform(shader, "clump_thickness"),
clump_thickness);
- glUniform1f(GPU_shader_get_uniform(shader, "clump_shape"), clump_shape);
- glUniform1f(GPU_shader_get_uniform(shader, "curl_thickness"),
curl_thickness);
- glUniform1f(GPU_shader_get_uniform(shader, "curl_shape"), curl_shape);
- glUniform1f(GPU_shader_get_uniform(shader, "curl_radius"), curl_radius);
- glUniform1f(GPU_shader_get_uniform(shader, "curl_length"), curl_length);
glUniform1i(GPU_shader_get_uniform(shader, "debug_mode"), debug_value
!= 0);
glUniform1i(GPU_shader_get_uniform(shader, "debug_value"), debug_value);
glUniform1f(GPU_shader_get_uniform(shader, "debug_scale"), debug_scale);
diff --git a/source/blender/makesdna/DNA_modifier_types.h
b/source/blender/makesdna/DNA_modifier_types.h
index 2066867..0d4f46a 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1562,9 +1562,6 @@ typedef struct StrandsModifierData {
struct GPUDrawStrands *gpu_buffer; /* draw data (runtime) */
- float clump_thickness, clump_shape;
- float curl_thickness, curl_shape, curl_radius, curl_length;
-
int debug_value; /* debugging value */
float debug_scale; /* scale for debug vectors */
} StrandsModifierData;
diff --git a/source/blender/modifiers/intern/MOD_strands.c
b/source/blender/modifiers/intern/MOD_strands.c
index 4df69ef..3f975ef 100644
--- a/source/blender/modifiers/intern/MOD_strands.c
+++ b/source/blender/modifiers/intern/MOD_strands.c
@@ -68,13 +68,6 @@ static void initData(ModifierData *md)
smd->ribbon_width = 0.005f;
- smd->clump_thickness = 0.1f;
- smd->clump_shape = 1.0f;
- smd->curl_thickness = 0.1f;
- smd->curl_shape = 1.0f;
- smd->curl_radius = 0.3f;
- smd->curl_length = 0.3f;
-
smd->debug_scale = 1.0f;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
