Revision: 58828
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58828
Author: dingto
Date: 2013-08-02 14:40:21 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
Cycles / Subsurface Render Passes:
* Code cleanup, "subs" abbreviation is not really meaningful, so let's write
"subsurface" instead.
Modified Paths:
--------------
branches/soc-2013-dingto/source/blender/blenkernel/BKE_node.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_scene_types.h
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_render.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-dingto/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2013-dingto/source/blender/render/intern/source/render_result.c
Modified: branches/soc-2013-dingto/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/BKE_node.h
2013-08-02 13:35:04 UTC (rev 58827)
+++ branches/soc-2013-dingto/source/blender/blenkernel/BKE_node.h
2013-08-02 14:40:21 UTC (rev 58828)
@@ -778,37 +778,37 @@
/* ************** COMPOSITE NODES *************** */
/* output socket defines */
-#define RRES_OUT_IMAGE 0
-#define RRES_OUT_ALPHA 1
-#define RRES_OUT_Z 2
-#define RRES_OUT_NORMAL 3
-#define RRES_OUT_UV 4
-#define RRES_OUT_VEC 5
-#define RRES_OUT_RGBA 6
-#define RRES_OUT_DIFF 7
-#define RRES_OUT_SPEC 8
-#define RRES_OUT_SHADOW 9
-#define RRES_OUT_AO 10
-#define RRES_OUT_REFLECT 11
-#define RRES_OUT_REFRACT 12
-#define RRES_OUT_INDIRECT 13
-#define RRES_OUT_INDEXOB 14
-#define RRES_OUT_INDEXMA 15
-#define RRES_OUT_MIST 16
-#define RRES_OUT_EMIT 17
-#define RRES_OUT_ENV 18
-#define RRES_OUT_DIFF_DIRECT 19
-#define RRES_OUT_DIFF_INDIRECT 20
-#define RRES_OUT_DIFF_COLOR 21
-#define RRES_OUT_GLOSSY_DIRECT 22
-#define RRES_OUT_GLOSSY_INDIRECT 23
-#define RRES_OUT_GLOSSY_COLOR 24
-#define RRES_OUT_TRANSM_DIRECT 25
-#define RRES_OUT_TRANSM_INDIRECT 26
-#define RRES_OUT_TRANSM_COLOR 27
-#define RRES_OUT_SUBS_DIRECT 28
-#define RRES_OUT_SUBS_INDIRECT 29
-#define RRES_OUT_SUBS_COLOR 30
+#define RRES_OUT_IMAGE 0
+#define RRES_OUT_ALPHA 1
+#define RRES_OUT_Z 2
+#define RRES_OUT_NORMAL 3
+#define RRES_OUT_UV 4
+#define RRES_OUT_VEC 5
+#define RRES_OUT_RGBA 6
+#define RRES_OUT_DIFF 7
+#define RRES_OUT_SPEC 8
+#define RRES_OUT_SHADOW 9
+#define RRES_OUT_AO 10
+#define RRES_OUT_REFLECT 11
+#define RRES_OUT_REFRACT 12
+#define RRES_OUT_INDIRECT 13
+#define RRES_OUT_INDEXOB 14
+#define RRES_OUT_INDEXMA 15
+#define RRES_OUT_MIST 16
+#define RRES_OUT_EMIT 17
+#define RRES_OUT_ENV 18
+#define RRES_OUT_DIFF_DIRECT 19
+#define RRES_OUT_DIFF_INDIRECT 20
+#define RRES_OUT_DIFF_COLOR 21
+#define RRES_OUT_GLOSSY_DIRECT 22
+#define RRES_OUT_GLOSSY_INDIRECT 23
+#define RRES_OUT_GLOSSY_COLOR 24
+#define RRES_OUT_TRANSM_DIRECT 25
+#define RRES_OUT_TRANSM_INDIRECT 26
+#define RRES_OUT_TRANSM_COLOR 27
+#define RRES_OUT_SUBSURFACE_DIRECT 28
+#define RRES_OUT_SUBSURFACE_INDIRECT 29
+#define RRES_OUT_SUBSURFACE_COLOR 30
/* note: types are needed to restore callbacks, don't change values */
#define CMP_NODE_VIEWER 201
Modified: branches/soc-2013-dingto/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- branches/soc-2013-dingto/source/blender/makesdna/DNA_scene_types.h
2013-08-02 13:35:04 UTC (rev 58827)
+++ branches/soc-2013-dingto/source/blender/makesdna/DNA_scene_types.h
2013-08-02 14:40:21 UTC (rev 58828)
@@ -209,37 +209,37 @@
#define SCE_LAY_NEG_ZMASK 0x80000
/* srl->passflag */
-#define SCE_PASS_COMBINED (1<<0)
-#define SCE_PASS_Z (1<<1)
-#define SCE_PASS_RGBA (1<<2)
-#define SCE_PASS_DIFFUSE (1<<3)
-#define SCE_PASS_SPEC (1<<4)
-#define SCE_PASS_SHADOW (1<<5)
-#define SCE_PASS_AO (1<<6)
-#define SCE_PASS_REFLECT (1<<7)
-#define SCE_PASS_NORMAL (1<<8)
-#define SCE_PASS_VECTOR (1<<9)
-#define SCE_PASS_REFRACT (1<<10)
-#define SCE_PASS_INDEXOB (1<<11)
-#define SCE_PASS_UV (1<<12)
-#define SCE_PASS_INDIRECT (1<<13)
-#define SCE_PASS_MIST (1<<14)
-#define SCE_PASS_RAYHITS (1<<15)
-#define SCE_PASS_EMIT (1<<16)
-#define SCE_PASS_ENVIRONMENT (1<<17)
-#define SCE_PASS_INDEXMA (1<<18)
-#define SCE_PASS_DIFFUSE_DIRECT (1<<19)
-#define SCE_PASS_DIFFUSE_INDIRECT (1<<20)
-#define SCE_PASS_DIFFUSE_COLOR (1<<21)
-#define SCE_PASS_GLOSSY_DIRECT (1<<22)
-#define SCE_PASS_GLOSSY_INDIRECT (1<<23)
-#define SCE_PASS_GLOSSY_COLOR (1<<24)
-#define SCE_PASS_TRANSM_DIRECT (1<<25)
-#define SCE_PASS_TRANSM_INDIRECT (1<<26)
-#define SCE_PASS_TRANSM_COLOR (1<<27)
-#define SCE_PASS_SUBS_DIRECT (1<<28)
-#define SCE_PASS_SUBS_INDIRECT (1<<29)
-#define SCE_PASS_SUBS_COLOR (1<<30)
+#define SCE_PASS_COMBINED (1<<0)
+#define SCE_PASS_Z (1<<1)
+#define SCE_PASS_RGBA (1<<2)
+#define SCE_PASS_DIFFUSE (1<<3)
+#define SCE_PASS_SPEC (1<<4)
+#define SCE_PASS_SHADOW (1<<5)
+#define SCE_PASS_AO (1<<6)
+#define SCE_PASS_REFLECT (1<<7)
+#define SCE_PASS_NORMAL (1<<8)
+#define SCE_PASS_VECTOR (1<<9)
+#define SCE_PASS_REFRACT (1<<10)
+#define SCE_PASS_INDEXOB (1<<11)
+#define SCE_PASS_UV (1<<12)
+#define SCE_PASS_INDIRECT (1<<13)
+#define SCE_PASS_MIST (1<<14)
+#define SCE_PASS_RAYHITS (1<<15)
+#define SCE_PASS_EMIT (1<<16)
+#define SCE_PASS_ENVIRONMENT (1<<17)
+#define SCE_PASS_INDEXMA (1<<18)
+#define SCE_PASS_DIFFUSE_DIRECT (1<<19)
+#define SCE_PASS_DIFFUSE_INDIRECT (1<<20)
+#define SCE_PASS_DIFFUSE_COLOR (1<<21)
+#define SCE_PASS_GLOSSY_DIRECT (1<<22)
+#define SCE_PASS_GLOSSY_INDIRECT (1<<23)
+#define SCE_PASS_GLOSSY_COLOR (1<<24)
+#define SCE_PASS_TRANSM_DIRECT (1<<25)
+#define SCE_PASS_TRANSM_INDIRECT (1<<26)
+#define SCE_PASS_TRANSM_COLOR (1<<27)
+#define SCE_PASS_SUBSURFACE_DIRECT (1<<28)
+#define SCE_PASS_SUBSURFACE_INDIRECT (1<<29)
+#define SCE_PASS_SUBSURFACE_COLOR (1<<30)
/* note, srl->passflag is treestore element 'nr' in outliner, short still... */
Modified: branches/soc-2013-dingto/source/blender/makesrna/intern/rna_render.c
===================================================================
--- branches/soc-2013-dingto/source/blender/makesrna/intern/rna_render.c
2013-08-02 13:35:04 UTC (rev 58827)
+++ branches/soc-2013-dingto/source/blender/makesrna/intern/rna_render.c
2013-08-02 14:40:21 UTC (rev 58828)
@@ -570,9 +570,9 @@
{SCE_PASS_TRANSM_DIRECT, "TRANSMISSION_DIRECT", 0,
"Transmission Direct", ""},
{SCE_PASS_TRANSM_INDIRECT, "TRANSMISSION_INDIRECT", 0,
"Transmission Indirect", ""},
{SCE_PASS_TRANSM_COLOR, "TRANSMISSION_COLOR", 0, "Transmission
Color", ""},
- {SCE_PASS_SUBS_DIRECT, "SUBSURFACE_DIRECT", 0, "Subsurface
Direct", ""},
- {SCE_PASS_SUBS_INDIRECT, "SUBSURFACE_INDIRECT", 0, "Subsurface
Indirect", ""},
- {SCE_PASS_SUBS_COLOR, "SUBSURFACE_COLOR", 0, "Subsurface
Color", ""},
+ {SCE_PASS_SUBSURFACE_DIRECT, "SUBSURFACE_DIRECT", 0,
"Subsurface Direct", ""},
+ {SCE_PASS_SUBSURFACE_INDIRECT, "SUBSURFACE_INDIRECT", 0,
"Subsurface Indirect", ""},
+ {SCE_PASS_SUBSURFACE_COLOR, "SUBSURFACE_COLOR", 0, "Subsurface
Color", ""},
{0, NULL, 0, NULL, NULL}
};
Modified: branches/soc-2013-dingto/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/soc-2013-dingto/source/blender/makesrna/intern/rna_scene.c
2013-08-02 13:35:04 UTC (rev 58827)
+++ branches/soc-2013-dingto/source/blender/makesrna/intern/rna_scene.c
2013-08-02 14:40:21 UTC (rev 58828)
@@ -2557,19 +2557,19 @@
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop = RNA_def_property(srna, "use_pass_subsurface_direct",
PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "passflag",
SCE_PASS_SUBS_DIRECT);
+ RNA_def_property_boolean_sdna(prop, NULL, "passflag",
SCE_PASS_SUBSURFACE_DIRECT);
RNA_def_property_ui_text(prop, "Subsurface Direct", "Deliver subsurface
direct pass");
if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS,
"rna_SceneRenderLayer_pass_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop = RNA_def_property(srna, "use_pass_subsurface_indirect",
PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "passflag",
SCE_PASS_SUBS_INDIRECT);
+ RNA_def_property_boolean_sdna(prop, NULL, "passflag",
SCE_PASS_SUBSURFACE_INDIRECT);
RNA_def_property_ui_text(prop, "Subsurface Indirect", "Deliver
subsurface indirect pass");
if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS,
"rna_SceneRenderLayer_pass_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop = RNA_def_property(srna, "use_pass_subsurface_color",
PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "passflag",
SCE_PASS_SUBS_COLOR);
+ RNA_def_property_boolean_sdna(prop, NULL, "passflag",
SCE_PASS_SUBSURFACE_COLOR);
RNA_def_property_ui_text(prop, "Subsurface Color", "Deliver subsurface
color pass");
if (scene) RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS,
"rna_SceneRenderLayer_pass_update");
else RNA_def_property_clear_flag(prop, PROP_EDITABLE);
Modified:
branches/soc-2013-dingto/source/blender/nodes/composite/nodes/node_composite_image.c
===================================================================
---
branches/soc-2013-dingto/source/blender/nodes/composite/nodes/node_composite_image.c
2013-08-02 13:35:04 UTC (rev 58827)
+++
branches/soc-2013-dingto/source/blender/nodes/composite/nodes/node_composite_image.c
2013-08-02 14:40:21 UTC (rev 58828)
@@ -156,12 +156,12 @@
if (passflag & SCE_PASS_TRANSM_COLOR)
cmp_node_image_add_render_pass_output(ntree, node,
SCE_PASS_TRANSM_COLOR, RRES_OUT_TRANSM_COLOR);
- if (passflag & SCE_PASS_SUBS_DIRECT)
- cmp_node_image_add_render_pass_output(ntree, node,
SCE_PASS_SUBS_DIRECT, RRES_OUT_SUBS_DIRECT);
- if (passflag & SCE_PASS_SUBS_INDIRECT)
- cmp_node_image_add_render_pass_output(ntree, node,
SCE_PASS_SUBS_INDIRECT, RRES_OUT_SUBS_INDIRECT);
- if (passflag & SCE_PASS_SUBS_COLOR)
- cmp_node_image_add_render_pass_output(ntree, node,
SCE_PASS_SUBS_COLOR, RRES_OUT_SUBS_COLOR);
+ if (passflag & SCE_PASS_SUBSURFACE_DIRECT)
+ cmp_node_image_add_render_pass_output(ntree, node,
SCE_PASS_SUBSURFACE_DIRECT, RRES_OUT_SUBSURFACE_DIRECT);
+ if (passflag & SCE_PASS_SUBSURFACE_INDIRECT)
+ cmp_node_image_add_render_pass_output(ntree, node,
SCE_PASS_SUBSURFACE_INDIRECT, RRES_OUT_SUBSURFACE_INDIRECT);
+ if (passflag & SCE_PASS_SUBSURFACE_COLOR)
+ cmp_node_image_add_render_pass_output(ntree, node,
SCE_PASS_SUBSURFACE_COLOR, RRES_OUT_SUBSURFACE_COLOR);
}
static void cmp_node_image_add_multilayer_outputs(bNodeTree *ntree, bNode
*node, RenderLayer *rl)
@@ -395,38 +395,38 @@
for (sock = node->outputs.first; sock; sock = sock->next)
sock->flag &= ~SOCK_UNAVAIL;
- set_output_visible(node, passflag, RRES_OUT_IMAGE,
SCE_PASS_COMBINED);
- set_output_visible(node, passflag, RRES_OUT_ALPHA,
SCE_PASS_COMBINED);
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
