[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47307] branches/soc-2011-tomato: svn merge ^/trunk/blender -r47272:47306
Campbell Barton
ideasman42 at gmail.com
Fri Jun 1 07:50:18 CEST 2012
Revision: 47307
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47307
Author: campbellbarton
Date: 2012-06-01 05:50:17 +0000 (Fri, 01 Jun 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r47272:47306
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47272
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/kernel/kernel_textures.h
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_lasso.h
branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GlareNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MathBaseOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_MovieDistortionOperation.h
branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.h
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_add.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-tomato/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_SkinDeformer.h
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GlareGhostOperation.h
Removed Paths:
-------------
branches/soc-2011-tomato/source/blender/compositor/operations/COM_LensGhostOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_LensGhostOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_LensGlowImageOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_LensGlowImageOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_LensGlowOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_LensGlowOperation.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-47272
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-47306
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel_textures.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel_textures.h 2012-06-01 05:46:09 UTC (rev 47306)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel_textures.h 2012-06-01 05:50:17 UTC (rev 47307)
@@ -1,3 +1,20 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
#ifndef KERNEL_TEX
#define KERNEL_TEX(type, ttype, name)
Modified: branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py 2012-06-01 05:46:09 UTC (rev 47306)
+++ branches/soc-2011-tomato/release/scripts/modules/bpy_extras/keyconfig_utils.py 2012-06-01 05:50:17 UTC (rev 47307)
@@ -146,7 +146,7 @@
return result
for pname in properties.bl_rna.properties.keys():
- if pname != "rna_type" and not properties.is_property_hidden(pname):
+ if pname != "rna_type":
value = getattr(properties, pname)
if isinstance(value, OperatorProperties):
_export_properties(prefix + "." + pname, value, lines)
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c 2012-06-01 05:46:09 UTC (rev 47306)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c 2012-06-01 05:50:17 UTC (rev 47307)
@@ -1054,10 +1054,10 @@
}
if (make_black) { /* TODO, theme color */
- r_col[3] = 0;
+ r_col[3] = 255;
r_col[2] = 0;
r_col[1] = 0;
- r_col[0] = 255;
+ r_col[0] = 0;
}
else {
CLAMP(input, 0.0f, 1.0f);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c 2012-06-01 05:46:09 UTC (rev 47306)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c 2012-06-01 05:50:17 UTC (rev 47307)
@@ -840,7 +840,7 @@
int actcol_orig = ob->actcol;
short i;
- while (object_remove_material_slot(ob)) {};
+ while (object_remove_material_slot(ob)) {}
/* now we have the right number of slots */
for (i = 0; i < totcol; i++)
Modified: branches/soc-2011-tomato/source/blender/blenlib/BLI_lasso.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/BLI_lasso.h 2012-06-01 05:46:09 UTC (rev 47306)
+++ branches/soc-2011-tomato/source/blender/blenlib/BLI_lasso.h 2012-06-01 05:50:17 UTC (rev 47307)
@@ -35,7 +35,7 @@
struct rcti;
void BLI_lasso_boundbox(struct rcti *rect, int mcords[][2], short moves);
-int BLI_lasso_is_point_inside(int mcords[][2], short moves, int sx, int sy, const int error_value);
+int BLI_lasso_is_point_inside(int mcords[][2], short moves, const int sx, const int sy, const int error_value);
int BLI_lasso_is_edge_inside(int mcords[][2], short moves, int x0, int y0, int x1, int y1, const int error_value);
#endif
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c 2012-06-01 05:46:09 UTC (rev 47306)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c 2012-06-01 05:50:17 UTC (rev 47307)
@@ -98,7 +98,7 @@
if (lslash)
lenlslash = (int)(lslash - string);
- while (len > lenlslash && string[--len] != '.') {};
+ while (len > lenlslash && string[--len] != '.') {}
if (len == lenlslash && string[len] != '.') len = len2;
for (i = len - 1; i >= lenlslash; i--) {
Modified: branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt 2012-06-01 05:46:09 UTC (rev 47306)
+++ branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt 2012-06-01 05:50:17 UTC (rev 47307)
@@ -189,10 +189,6 @@
operations/COM_CropOperation.cpp
operations/COM_CropOperation.h
- operations/COM_LensGlowOperation.cpp
- operations/COM_LensGlowOperation.h
- operations/COM_LensGhostOperation.cpp
- operations/COM_LensGhostOperation.h
nodes/COM_TransformNode.cpp
nodes/COM_TransformNode.h
nodes/COM_Stabilize2dNode.cpp
@@ -388,16 +384,14 @@
operations/COM_RenderLayersCyclesOperation.cpp
operations/COM_RenderLayersCyclesOperation.h
-operations/COM_ImageOperation.cpp
-operations/COM_ImageOperation.h
-operations/COM_MultilayerImageOperation.cpp
-operations/COM_MultilayerImageOperation.h
-operations/COM_TextureOperation.cpp
-operations/COM_TextureOperation.h
-operations/COM_BokehImageOperation.cpp
-operations/COM_BokehImageOperation.h
-operations/COM_LensGlowImageOperation.cpp
-operations/COM_LensGlowImageOperation.h
+ operations/COM_ImageOperation.cpp
+ operations/COM_ImageOperation.h
+ operations/COM_MultilayerImageOperation.cpp
+ operations/COM_MultilayerImageOperation.h
+ operations/COM_TextureOperation.cpp
+ operations/COM_TextureOperation.h
+ operations/COM_BokehImageOperation.cpp
+ operations/COM_BokehImageOperation.h
operations/COM_SocketProxyOperation.h
@@ -589,6 +583,8 @@
operations/COM_GlareSimpleStarOperation.h
operations/COM_GlareStreaksOperation.cpp
operations/COM_GlareStreaksOperation.h
+ operations/COM_GlareGhostOperation.cpp
+ operations/COM_GlareGhostOperation.h
operations/COM_SetSamplerOperation.cpp
operations/COM_SetSamplerOperation.h
Modified: branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp 2012-06-01 05:46:09 UTC (rev 47306)
+++ branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp 2012-06-01 05:50:17 UTC (rev 47307)
@@ -275,7 +275,8 @@
printf("%s", build_log);
delete build_log;
- } else {
+ }
+ else {
unsigned int indexDevices;
for (indexDevices = 0 ; indexDevices < totalNumberOfDevices ; indexDevices ++) {
cl_device_id device = cldevices[indexDevices];
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DilateErodeNode.cpp 2012-06-01 05:46:09 UTC (rev 47306)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_DilateErodeNode.cpp 2012-06-01 05:50:17 UTC (rev 47307)
@@ -52,7 +52,8 @@
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
}
graph->addOperation(operation);
- } else if (editorNode->custom1 == CMP_NODE_DILATEERODE_DISTANCE) {
+ }
+ else if (editorNode->custom1 == CMP_NODE_DILATEERODE_DISTANCE) {
if (editorNode->custom2 > 0) {
DilateDistanceOperation * operation = new DilateDistanceOperation();
operation->setDistance(editorNode->custom2);
@@ -67,7 +68,8 @@
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
graph->addOperation(operation);
}
- } else {
+ }
+ else {
if (editorNode->custom2 > 0) {
DilateStepOperation * operation = new DilateStepOperation();
operation->setIterations(editorNode->custom2);
Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GlareNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GlareNode.cpp 2012-06-01 05:46:09 UTC (rev 47306)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GlareNode.cpp 2012-06-01 05:50:17 UTC (rev 47307)
@@ -29,6 +29,7 @@
#include "COM_SetValueOperation.h"
#include "COM_MixBlendOperation.h"
#include "COM_FastGaussianBlurOperation.h"
+#include "COM_GlareGhostOperation.h"
GlareNode::GlareNode(bNode *editorNode): Node(editorNode)
{
@@ -42,6 +43,30 @@
switch (glare->type) {
default:
+ case 3:
+ {
+ GlareThresholdOperation *thresholdOperation = new GlareThresholdOperation();
+ GlareGhostOperation * glareoperation = new GlareGhostOperation();
+ SetValueOperation * mixvalueoperation = new SetValueOperation();
+ MixBlendOperation * mixoperation = new MixBlendOperation();
+
+ this->getInputSocket(0)->relinkConnections(thresholdOperation->getInputSocket(0), 0, system);
+ addLink(system, thresholdOperation->getOutputSocket(), glareoperation->getInputSocket(0));
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list