[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55430] branches/soc-2008-mxcurioni/source /blender/blenkernel/intern/linestyle.c: Code clean-up suggested by Sergey Sharybin through a code review of the branch .
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Wed Mar 20 00:54:15 CET 2013
Revision: 55430
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55430
Author: kjym3
Date: 2013-03-19 23:54:14 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------
Code clean-up suggested by Sergey Sharybin through a code review of the branch.
* Removed the checks of NULL pointers after malloc/calloc.
* Replaced repeated cast operations with a temporary variable initialized with one cast operation.
* Removed an unused switch block (meant to be a place to put per-modifier resource management code).
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c 2013-03-19 23:17:44 UTC (rev 55429)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c 2013-03-19 23:54:14 UTC (rev 55430)
@@ -176,12 +176,10 @@
LineStyleModifier *m;
m = (LineStyleModifier *)MEM_callocN(size, "line style modifier");
- if (m) {
- m->type = type;
- strcpy(m->name, modifier_name[type]);
- m->influence = 1.0f;
- m->flags = LS_MODIFIER_ENABLED | LS_MODIFIER_EXPANDED;
- }
+ m->type = type;
+ strcpy(m->name, modifier_name[type]);
+ m->influence = 1.0f;
+ m->flags = LS_MODIFIER_ENABLED | LS_MODIFIER_EXPANDED;
return m;
}
@@ -221,8 +219,6 @@
LineStyleModifier *m;
m = alloc_color_modifier(type);
- if (!m)
- return NULL;
m->blend = MA_RAMP_BLEND;
switch (type) {
@@ -257,8 +253,6 @@
LineStyleModifier *new_m;
new_m = alloc_color_modifier(m->type);
- if (!new_m)
- return NULL;
new_m->influence = m->influence;
new_m->flags = m->flags;
new_m->blend = m->blend;
@@ -267,33 +261,37 @@
case LS_MODIFIER_ALONG_STROKE:
{
LineStyleColorModifier_AlongStroke *p = (LineStyleColorModifier_AlongStroke *)m;
- ((LineStyleColorModifier_AlongStroke *)new_m)->color_ramp = MEM_dupallocN(p->color_ramp);
+ LineStyleColorModifier_AlongStroke *q = (LineStyleColorModifier_AlongStroke *)new_m;
+ q->color_ramp = MEM_dupallocN(p->color_ramp);
}
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
{
LineStyleColorModifier_DistanceFromCamera *p = (LineStyleColorModifier_DistanceFromCamera *)m;
- ((LineStyleColorModifier_DistanceFromCamera *)new_m)->color_ramp = MEM_dupallocN(p->color_ramp);
- ((LineStyleColorModifier_DistanceFromCamera *)new_m)->range_min = p->range_min;
- ((LineStyleColorModifier_DistanceFromCamera *)new_m)->range_max = p->range_max;
+ LineStyleColorModifier_DistanceFromCamera *q = (LineStyleColorModifier_DistanceFromCamera *)new_m;
+ q->color_ramp = MEM_dupallocN(p->color_ramp);
+ q->range_min = p->range_min;
+ q->range_max = p->range_max;
}
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
{
LineStyleColorModifier_DistanceFromObject *p = (LineStyleColorModifier_DistanceFromObject *)m;
+ LineStyleColorModifier_DistanceFromObject *q = (LineStyleColorModifier_DistanceFromObject *)new_m;
if (p->target)
p->target->id.us++;
- ((LineStyleColorModifier_DistanceFromObject *)new_m)->target = p->target;
- ((LineStyleColorModifier_DistanceFromObject *)new_m)->color_ramp = MEM_dupallocN(p->color_ramp);
- ((LineStyleColorModifier_DistanceFromObject *)new_m)->range_min = p->range_min;
- ((LineStyleColorModifier_DistanceFromObject *)new_m)->range_max = p->range_max;
+ q->target = p->target;
+ q->color_ramp = MEM_dupallocN(p->color_ramp);
+ q->range_min = p->range_min;
+ q->range_max = p->range_max;
}
break;
case LS_MODIFIER_MATERIAL:
{
LineStyleColorModifier_Material *p = (LineStyleColorModifier_Material *)m;
- ((LineStyleColorModifier_Material *)new_m)->color_ramp = MEM_dupallocN(p->color_ramp);
- ((LineStyleColorModifier_Material *)new_m)->mat_attr = p->mat_attr;
+ LineStyleColorModifier_Material *q = (LineStyleColorModifier_Material *)new_m;
+ q->color_ramp = MEM_dupallocN(p->color_ramp);
+ q->mat_attr = p->mat_attr;
}
break;
default:
@@ -351,28 +349,38 @@
LineStyleModifier *m;
m = alloc_alpha_modifier(type);
- if (!m)
- return NULL;
m->blend = LS_VALUE_BLEND;
switch (type) {
case LS_MODIFIER_ALONG_STROKE:
- ((LineStyleAlphaModifier_AlongStroke *)m)->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+ {
+ LineStyleAlphaModifier_AlongStroke *p = (LineStyleAlphaModifier_AlongStroke *)m;
+ p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+ }
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
- ((LineStyleAlphaModifier_DistanceFromCamera *)m)->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
- ((LineStyleAlphaModifier_DistanceFromCamera *)m)->range_min = 0.0f;
- ((LineStyleAlphaModifier_DistanceFromCamera *)m)->range_max = 10000.0f;
+ {
+ LineStyleAlphaModifier_DistanceFromCamera *p = (LineStyleAlphaModifier_DistanceFromCamera *)m;
+ p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+ p->range_min = 0.0f;
+ p->range_max = 10000.0f;
+ }
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
- ((LineStyleAlphaModifier_DistanceFromObject *)m)->target = NULL;
- ((LineStyleAlphaModifier_DistanceFromObject *)m)->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
- ((LineStyleAlphaModifier_DistanceFromObject *)m)->range_min = 0.0f;
- ((LineStyleAlphaModifier_DistanceFromObject *)m)->range_max = 10000.0f;
+ {
+ LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *)m;
+ p->target = NULL;
+ p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+ p->range_min = 0.0f;
+ p->range_max = 10000.0f;
+ }
break;
case LS_MODIFIER_MATERIAL:
- ((LineStyleAlphaModifier_Material *)m)->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
- ((LineStyleAlphaModifier_Material *)m)->mat_attr = LS_MODIFIER_MATERIAL_DIFF;
+ {
+ LineStyleAlphaModifier_Material *p = (LineStyleAlphaModifier_Material *)m;
+ p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+ p->mat_attr = LS_MODIFIER_MATERIAL_DIFF;
+ }
break;
default:
return NULL; /* unknown modifier type */
@@ -387,8 +395,6 @@
LineStyleModifier *new_m;
new_m = alloc_alpha_modifier(m->type);
- if (!new_m)
- return NULL;
new_m->influence = m->influence;
new_m->flags = m->flags;
new_m->blend = m->blend;
@@ -397,33 +403,37 @@
case LS_MODIFIER_ALONG_STROKE:
{
LineStyleAlphaModifier_AlongStroke *p = (LineStyleAlphaModifier_AlongStroke *)m;
- ((LineStyleAlphaModifier_AlongStroke *)new_m)->curve = curvemapping_copy(p->curve);
+ LineStyleAlphaModifier_AlongStroke *q = (LineStyleAlphaModifier_AlongStroke *)new_m;
+ q->curve = curvemapping_copy(p->curve);
}
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
{
LineStyleAlphaModifier_DistanceFromCamera *p = (LineStyleAlphaModifier_DistanceFromCamera *)m;
- ((LineStyleAlphaModifier_DistanceFromCamera *)new_m)->curve = curvemapping_copy(p->curve);
- ((LineStyleAlphaModifier_DistanceFromCamera *)new_m)->range_min = p->range_min;
- ((LineStyleAlphaModifier_DistanceFromCamera *)new_m)->range_max = p->range_max;
+ LineStyleAlphaModifier_DistanceFromCamera *q = (LineStyleAlphaModifier_DistanceFromCamera *)new_m;
+ q->curve = curvemapping_copy(p->curve);
+ q->range_min = p->range_min;
+ q->range_max = p->range_max;
}
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
{
LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *)m;
+ LineStyleAlphaModifier_DistanceFromObject *q = (LineStyleAlphaModifier_DistanceFromObject *)new_m;
if (p->target)
p->target->id.us++;
- ((LineStyleAlphaModifier_DistanceFromObject *)new_m)->target = p->target;
- ((LineStyleAlphaModifier_DistanceFromObject *)new_m)->curve = curvemapping_copy(p->curve);
- ((LineStyleAlphaModifier_DistanceFromObject *)new_m)->range_min = p->range_min;
- ((LineStyleAlphaModifier_DistanceFromObject *)new_m)->range_max = p->range_max;
+ q->target = p->target;
+ q->curve = curvemapping_copy(p->curve);
+ q->range_min = p->range_min;
+ q->range_max = p->range_max;
}
break;
case LS_MODIFIER_MATERIAL:
{
LineStyleAlphaModifier_Material *p = (LineStyleAlphaModifier_Material *)m;
- ((LineStyleAlphaModifier_Material *)new_m)->curve = curvemapping_copy(p->curve);
- ((LineStyleAlphaModifier_Material *)new_m)->mat_attr = p->mat_attr;
+ LineStyleAlphaModifier_Material *q = (LineStyleAlphaModifier_Material *)new_m;
+ q->curve = curvemapping_copy(p->curve);
+ q->mat_attr = p->mat_attr;
}
break;
default:
@@ -485,41 +495,54 @@
LineStyleModifier *m;
m = alloc_thickness_modifier(type);
- if (!m)
- return NULL;
m->blend = LS_VALUE_BLEND;
switch (type) {
case LS_MODIFIER_ALONG_STROKE:
- ((LineStyleThicknessModifier_AlongStroke *)m)->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
- ((LineStyleThicknessModifier_AlongStroke *)m)->value_min = 0.0f;
- ((LineStyleThicknessModifier_AlongStroke *)m)->value_max = 1.0f;
+ {
+ LineStyleThicknessModifier_AlongStroke *p = (LineStyleThicknessModifier_AlongStroke *)m;
+ p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+ p->value_min = 0.0f;
+ p->value_max = 1.0f;
+ }
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
- ((LineStyleThicknessModifier_DistanceFromCamera *)m)->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
- ((LineStyleThicknessModifier_DistanceFromCamera *)m)->range_min = 0.0f;
- ((LineStyleThicknessModifier_DistanceFromCamera *)m)->range_max = 1000.0f;
- ((LineStyleThicknessModifier_DistanceFromCamera *)m)->value_min = 0.0f;
- ((LineStyleThicknessModifier_DistanceFromCamera *)m)->value_max = 1.0f;
+ {
+ LineStyleThicknessModifier_DistanceFromCamera *p = (LineStyleThicknessModifier_DistanceFromCamera *)m;
+ p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+ p->range_min = 0.0f;
+ p->range_max = 1000.0f;
+ p->value_min = 0.0f;
+ p->value_max = 1.0f;
+ }
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
- ((LineStyleThicknessModifier_DistanceFromObject *)m)->target = NULL;
- ((LineStyleThicknessModifier_DistanceFromObject *)m)->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
- ((LineStyleThicknessModifier_DistanceFromObject *)m)->range_min = 0.0f;
- ((LineStyleThicknessModifier_DistanceFromObject *)m)->range_max = 1000.0f;
- ((LineStyleThicknessModifier_DistanceFromObject *)m)->value_min = 0.0f;
- ((LineStyleThicknessModifier_DistanceFromObject *)m)->value_max = 1.0f;
+ {
+ LineStyleThicknessModifier_DistanceFromObject *p = (LineStyleThicknessModifier_DistanceFromObject *)m;
+ p->target = NULL;
+ p->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+ p->range_min = 0.0f;
+ p->range_max = 1000.0f;
+ p->value_min = 0.0f;
+ p->value_max = 1.0f;
+ }
break;
case LS_MODIFIER_MATERIAL:
- ((LineStyleThicknessModifier_Material *)m)->curve = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
- ((LineStyleThicknessModifier_Material *)m)->mat_attr = LS_MODIFIER_MATERIAL_DIFF;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list