[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55635] trunk/blender: style cleanup: osl and NULL pointer use, also correct sequencer gap operator id's
Campbell Barton
ideasman42 at gmail.com
Wed Mar 27 21:27:08 CET 2013
Revision: 55635
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55635
Author: campbellbarton
Date: 2013-03-27 20:27:07 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
style cleanup: osl and NULL pointer use, also correct sequencer gap operator id's
Modified Paths:
--------------
trunk/blender/intern/cycles/kernel/shaders/node_brightness.osl
trunk/blender/intern/cycles/kernel/shaders/node_normal_map.osl
trunk/blender/intern/cycles/kernel/shaders/node_vector_curves.osl
trunk/blender/intern/cycles/kernel/shaders/node_ward_bsdf.osl
trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp
Modified: trunk/blender/intern/cycles/kernel/shaders/node_brightness.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_brightness.osl 2013-03-27 19:44:25 UTC (rev 55634)
+++ trunk/blender/intern/cycles/kernel/shaders/node_brightness.osl 2013-03-27 20:27:07 UTC (rev 55635)
@@ -25,10 +25,10 @@
output color ColorOut = 0.8)
{
float a = 1.0 + Contrast;
- float b = Bright - Contrast*0.5;
+ float b = Bright - Contrast * 0.5;
- ColorOut[0] = max(a*ColorIn[0] + b, 0.0);
- ColorOut[1] = max(a*ColorIn[1] + b, 0.0);
- ColorOut[2] = max(a*ColorIn[2] + b, 0.0);
+ ColorOut[0] = max(a * ColorIn[0] + b, 0.0);
+ ColorOut[1] = max(a * ColorIn[1] + b, 0.0);
+ ColorOut[2] = max(a * ColorIn[2] + b, 0.0);
}
Modified: trunk/blender/intern/cycles/kernel/shaders/node_normal_map.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_normal_map.osl 2013-03-27 19:44:25 UTC (rev 55634)
+++ trunk/blender/intern/cycles/kernel/shaders/node_normal_map.osl 2013-03-27 20:27:07 UTC (rev 55635)
@@ -35,9 +35,10 @@
float tangent_sign;
// get _unnormalized_ interpolated normal and tangent
- if(!getattribute(attr_name, tangent) ||
+ if (!getattribute(attr_name, tangent) ||
!getattribute(attr_sign_name, tangent_sign) ||
- !getattribute("geom:N", ninterp)) {
+ !getattribute("geom:N", ninterp))
+ {
Normal = normal(0, 0, 0);
}
else {
Modified: trunk/blender/intern/cycles/kernel/shaders/node_vector_curves.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_vector_curves.osl 2013-03-27 19:44:25 UTC (rev 55634)
+++ trunk/blender/intern/cycles/kernel/shaders/node_vector_curves.osl 2013-03-27 20:27:07 UTC (rev 55635)
@@ -21,7 +21,7 @@
float ramp_lookup(color ramp[RAMP_TABLE_SIZE], float at, int component)
{
- float f = clamp((at + 1.0)*0.5, 0.0, 1.0) * (RAMP_TABLE_SIZE - 1);
+ float f = clamp((at + 1.0) * 0.5, 0.0, 1.0) * (RAMP_TABLE_SIZE - 1);
/* clamp int as well in case of NaN */
int i = (int)f;
@@ -34,7 +34,7 @@
if (t > 0.0)
result = (1.0 - t) * result + t * ramp[i + 1][component];
- return result*2.0 - 1.0;
+ return result * 2.0 - 1.0;
}
shader node_vector_curves(
Modified: trunk/blender/intern/cycles/kernel/shaders/node_ward_bsdf.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/shaders/node_ward_bsdf.osl 2013-03-27 19:44:25 UTC (rev 55634)
+++ trunk/blender/intern/cycles/kernel/shaders/node_ward_bsdf.osl 2013-03-27 20:27:07 UTC (rev 55635)
@@ -31,7 +31,7 @@
vector T = Tangent;
if (Rotation != 0.0)
- T = rotate(T, Rotation*2.0*M_PI, point(0.0, 0.0, 0.0), Normal);
+ T = rotate(T, Rotation * 2.0 * M_PI, point(0.0, 0.0, 0.0), Normal);
/* compute roughness */
float RoughnessU, RoughnessV;
Modified: trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2013-03-27 19:44:25 UTC (rev 55634)
+++ trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py 2013-03-27 20:27:07 UTC (rev 55635)
@@ -284,8 +284,8 @@
layout.operator("transform.transform", text="Grab/Move").mode = 'TRANSLATION'
layout.operator("transform.transform", text="Grab/Extend from frame").mode = 'TIME_EXTEND'
- layout.operator("sequencer.no_gap")
- layout.operator("sequencer.insert_gap")
+ layout.operator("sequencer.gap_remove")
+ layout.operator("sequencer.gap_insert")
# uiItemO(layout, NULL, 0, "sequencer.strip_snap"); // TODO - add this operator
layout.separator()
Modified: trunk/blender/source/blender/gpu/intern/gpu_extensions.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2013-03-27 19:44:25 UTC (rev 55634)
+++ trunk/blender/source/blender/gpu/intern/gpu_extensions.c 2013-03-27 20:27:07 UTC (rev 55635)
@@ -402,7 +402,7 @@
}
else {
glTexImage2D(tex->target, 0, internalformat, tex->w, tex->h, 0,
- format, type, NULL);
+ format, type, NULL);
if (fpixels) {
glTexSubImage2D(tex->target, 0, 0, 0, w, h,
@@ -677,7 +677,7 @@
/* Now we tweak some of the settings */
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RG32F, size, size, 0, GL_RG, GL_FLOAT, 0);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RG32F, size, size, 0, GL_RG, GL_FLOAT, NULL);
GPU_texture_unbind(tex);
}
Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c 2013-03-27 19:44:25 UTC (rev 55634)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c 2013-03-27 20:27:07 UTC (rev 55635)
@@ -175,7 +175,7 @@
Image *ima= (Image *)node->id;
if (ima) {
ImageUser *iuser = node->storage;
- ImageUser load_iuser = {0};
+ ImageUser load_iuser = {NULL};
ImBuf *ibuf;
int offset = BKE_image_sequence_guess_offset(ima);
Modified: trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp 2013-03-27 19:44:25 UTC (rev 55634)
+++ trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp 2013-03-27 20:27:07 UTC (rev 55635)
@@ -199,7 +199,7 @@
for (int j=0;j<m_numfaces;j++) {
glBindTexture(GL_TEXTURE_2D, domefacesId[j]);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, m_imagesize, m_imagesize, 0, GL_RGB8,
- GL_UNSIGNED_BYTE, 0);
+ GL_UNSIGNED_BYTE, NULL);
glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, m_imagesize, m_imagesize, 0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -209,7 +209,7 @@
if (warp.usemesh) {
glBindTexture(GL_TEXTURE_2D, domefacesId[m_numfaces]);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, warp.imagesize, warp.imagesize, 0, GL_RGB8,
- GL_UNSIGNED_BYTE, 0);
+ GL_UNSIGNED_BYTE, NULL);
glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, warp.imagesize, warp.imagesize, 0);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
More information about the Bf-blender-cvs
mailing list