Revision: 48080
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48080
Author: jbakker
Date: 2012-06-19 13:52:41 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
Implemented Preview of defocus to set the quality of the node to Low
increased the inner loop of opencl
Modified Paths:
--------------
trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp
trunk/blender/source/blender/compositor/nodes/COM_DefocusNode.cpp
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
Modified: trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp
2012-06-19 13:48:19 UTC (rev 48079)
+++ trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp
2012-06-19 13:52:41 UTC (rev 48080)
@@ -208,7 +208,7 @@
const int height = outputMemoryBuffer->getHeight();
int offsetx;
int offsety;
- const int localSize = 32;
+ const int localSize = 128;
size_t size[2];
cl_int2 offset;
Modified: trunk/blender/source/blender/compositor/nodes/COM_DefocusNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_DefocusNode.cpp
2012-06-19 13:48:19 UTC (rev 48079)
+++ trunk/blender/source/blender/compositor/nodes/COM_DefocusNode.cpp
2012-06-19 13:52:41 UTC (rev 48080)
@@ -91,7 +91,11 @@
graph->addOperation(bokeh);
VariableSizeBokehBlurOperation *operation = new
VariableSizeBokehBlurOperation();
- operation->setQuality(context->getQuality());
+ if (data->preview) {
+ operation->setQuality(COM_QUALITY_LOW);
+ } else {
+ operation->setQuality(context->getQuality());
+ }
operation->setMaxBlur(data->maxblur);
operation->setThreshold(data->bthresh);
addLink(graph, bokeh->getOutputSocket(), operation->getInputSocket(1));
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-06-19
13:48:19 UTC (rev 48079)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-06-19
13:52:41 UTC (rev 48080)
@@ -1574,9 +1574,6 @@
col = uiLayoutColumn(layout, 0);
uiItemR(col, ptr, "use_preview", 0, NULL, ICON_NONE);
- sub = uiLayoutColumn(col, 0);
- uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_preview"));
- uiItemR(sub, ptr, "samples", 0, NULL, ICON_NONE);
col = uiLayoutColumn(layout, 0);
uiItemR(col, ptr, "use_zbuffer", 0, NULL, ICON_NONE);
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-06-19
13:48:19 UTC (rev 48079)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-06-19
13:52:41 UTC (rev 48080)
@@ -2562,15 +2562,9 @@
prop = RNA_def_property(srna, "use_preview", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "preview", 1);
- RNA_def_property_ui_text(prop, "Preview", "Enable sampling mode, useful
for preview when using low samplecounts");
+ RNA_def_property_ui_text(prop, "Preview", "Enable low quality mode,
useful for preview");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
-
- prop = RNA_def_property(srna, "samples", PROP_INT, PROP_NONE);
- RNA_def_property_int_sdna(prop, NULL, "samples");
- RNA_def_property_range(prop, 16, 256);
- RNA_def_property_ui_text(prop, "Samples", "Number of samples
(16=grainy, higher=less noise)");
- RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
-
+
prop = RNA_def_property(srna, "use_zbuffer", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "no_zbuf", 1);
RNA_def_property_ui_text(prop, "Use Z-Buffer",
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
