[Bf-blender-cvs] [84692844a3d] blender2.8: Fix merge error in 908b696, removed files were accidentally added back.

Brecht Van Lommel noreply at git.blender.org
Mon Jun 11 17:07:59 CEST 2018


Commit: 84692844a3d6493ce0649c5021ec92e684b59a86
Author: Brecht Van Lommel
Date:   Mon Jun 11 17:01:17 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB84692844a3d6493ce0649c5021ec92e684b59a86

Fix merge error in 908b696, removed files were accidentally added back.

===================================================================

D	source/blender/nodes/shader/nodes/node_shader_geom.c
D	source/blender/nodes/shader/nodes/node_shader_material.c
D	source/blender/nodes/shader/nodes/node_shader_output.c
D	source/blender/nodes/shader/nodes/node_shader_texture.c
D	source/blender/render/intern/include/envmap.h
D	source/blender/render/intern/include/pixelblending.h
D	source/blender/render/intern/include/pixelshading.h
D	source/blender/render/intern/include/pointdensity.h
D	source/blender/render/intern/include/raycounter.h
D	source/blender/render/intern/include/rayintersection.h
D	source/blender/render/intern/include/rendercore.h
D	source/blender/render/intern/include/shading.h
D	source/blender/render/intern/include/strand.h
D	source/blender/render/intern/include/sunsky.h
D	source/blender/render/intern/include/texture_ocean.h
D	source/blender/render/intern/include/voxeldata.h
D	source/blender/render/intern/raytrace/bvh.h
D	source/blender/render/intern/raytrace/rayobject.cpp
D	source/blender/render/intern/raytrace/rayobject_hint.h
D	source/blender/render/intern/raytrace/rayobject_instance.cpp
D	source/blender/render/intern/raytrace/rayobject_octree.cpp
D	source/blender/render/intern/raytrace/rayobject_qbvh.cpp
D	source/blender/render/intern/raytrace/rayobject_raycounter.cpp
D	source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
D	source/blender/render/intern/raytrace/rayobject_rtbuild.h
D	source/blender/render/intern/raytrace/rayobject_svbvh.cpp
D	source/blender/render/intern/raytrace/rayobject_vbvh.cpp
D	source/blender/render/intern/raytrace/reorganize.h
D	source/blender/render/intern/raytrace/svbvh.h
D	source/blender/render/intern/raytrace/vbvh.h
D	source/blender/render/intern/source/bake.c
D	source/blender/render/intern/source/convertblender.c
D	source/blender/render/intern/source/envmap.c
D	source/blender/render/intern/source/occlusion.c
D	source/blender/render/intern/source/pixelblending.c
D	source/blender/render/intern/source/pixelshading.c
D	source/blender/render/intern/source/rayshade.c
D	source/blender/render/intern/source/rendercore.c
D	source/blender/render/intern/source/renderdatabase.c
D	source/blender/render/intern/source/shadbuf.c
D	source/blender/render/intern/source/shadeinput.c
D	source/blender/render/intern/source/shadeoutput.c
D	source/blender/render/intern/source/sss.c
D	source/blender/render/intern/source/strand.c
D	source/blender/render/intern/source/sunsky.c
D	source/blender/render/intern/source/volume_precache.c
D	source/blender/render/intern/source/volumetric.c

===================================================================

diff --git a/source/blender/nodes/shader/nodes/node_shader_geom.c b/source/blender/nodes/shader/nodes/node_shader_geom.c
deleted file mode 100644
index 0a51ee8dc68..00000000000
--- a/source/blender/nodes/shader/nodes/node_shader_geom.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * 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.
- *
- * The Original Code is Copyright (C) 2005 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/nodes/shader/nodes/node_shader_geom.c
- *  \ingroup shdnodes
- */
-
-
-#include "node_shader_util.h"
-
-#include "DNA_customdata_types.h"
-
-/* **************** GEOMETRY  ******************** */
-
-/* output socket type definition */
-static bNodeSocketTemplate sh_node_geom_out[] = {
-	{	SOCK_VECTOR, 0, N_("Global")},
-	{	SOCK_VECTOR, 0, N_("Local")},
-	{	SOCK_VECTOR, 0, N_("View")},
-	{	SOCK_VECTOR, 0, N_("Orco")},
-	{	SOCK_VECTOR, 0, N_("UV")},
-	{	SOCK_VECTOR, 0, N_("Normal")},
-	{	SOCK_RGBA,   0, N_("Vertex Color")},
-	{	SOCK_FLOAT,   0, N_("Vertex Alpha")},
-	{	SOCK_FLOAT,   0, N_("Front/Back")},
-	{	-1, 0, ""	}
-};
-
-/* node execute callback */
-static void node_shader_exec_geom(void *data, int UNUSED(thread), bNode *node, bNodeExecData *UNUSED(execdata), bNodeStack **UNUSED(in), bNodeStack **out)
-{
-	if (data) {
-		ShadeInput *shi = ((ShaderCallData *)data)->shi;
-		NodeGeometry *ngeo = (NodeGeometry *)node->storage;
-		ShadeInputUV *suv = &shi->uv[shi->actuv];
-		static float defaultvcol[4] = {1.0f, 1.0f, 1.0f, 1.0f};
-		int i;
-
-		if (ngeo->uvname[0]) {
-			/* find uv map by name */
-			for (i = 0; i < shi->totuv; i++) {
-				if (STREQ(shi->uv[i].name, ngeo->uvname)) {
-					suv = &shi->uv[i];
-					break;
-				}
-			}
-		}
-
-		/* out: global, local, view, orco, uv, normal, vertex color */
-		copy_v3_v3(out[GEOM_OUT_GLOB]->vec, shi->gl);
-		copy_v3_v3(out[GEOM_OUT_LOCAL]->vec, shi->co);
-		copy_v3_v3(out[GEOM_OUT_VIEW]->vec, shi->view);
-		copy_v3_v3(out[GEOM_OUT_ORCO]->vec, shi->lo);
-		copy_v3_v3(out[GEOM_OUT_UV]->vec, suv->uv);
-		copy_v3_v3(out[GEOM_OUT_NORMAL]->vec, shi->vno);
-
-		if (shi->use_world_space_shading) {
-			negate_v3(out[GEOM_OUT_NORMAL]->vec);
-			mul_mat3_m4_v3((float (*)[4])RE_render_current_get_matrix(RE_VIEWINV_MATRIX), out[GEOM_OUT_NORMAL]->vec);
-		}
-		if (shi->totcol) {
-			/* find vertex color layer by name */
-			ShadeInputCol *scol = &shi->col[0];
-
-			if (ngeo->colname[0]) {
-				for (i = 0; i < shi->totcol; i++) {
-					if (STREQ(shi->col[i].name, ngeo->colname)) {
-						scol = &shi->col[i];
-						break;
-					}
-				}
-			}
-
-			srgb_to_linearrgb_v3_v3(out[GEOM_OUT_VCOL]->vec, scol->col);
-			out[GEOM_OUT_VCOL]->vec[3] = scol->col[3];
-			out[GEOM_OUT_VCOL_ALPHA]->vec[0] = scol->col[3];
-		}
-		else {
-			memcpy(out[GEOM_OUT_VCOL]->vec, defaultvcol, sizeof(defaultvcol));
-			out[GEOM_OUT_VCOL_ALPHA]->vec[0] = 1.0f;
-		}
-
-		if (shi->osatex) {
-			out[GEOM_OUT_GLOB]->data = shi->dxgl;
-			out[GEOM_OUT_GLOB]->datatype = NS_OSA_VECTORS;
-			out[GEOM_OUT_LOCAL]->data = shi->dxco;
-			out[GEOM_OUT_LOCAL]->datatype = NS_OSA_VECTORS;
-			out[GEOM_OUT_VIEW]->data = &shi->dxview;
-			out[GEOM_OUT_VIEW]->datatype = NS_OSA_VALUES;
-			out[GEOM_OUT_ORCO]->data = shi->dxlo;
-			out[GEOM_OUT_ORCO]->datatype = NS_OSA_VECTORS;
-			out[GEOM_OUT_UV]->data = suv->dxuv;
-			out[GEOM_OUT_UV]->datatype = NS_OSA_VECTORS;
-			out[GEOM_OUT_NORMAL]->data = shi->dxno;
-			out[GEOM_OUT_NORMAL]->datatype = NS_OSA_VECTORS;
-		}
-
-		/* front/back, normal flipping was stored */
-		out[GEOM_OUT_FRONTBACK]->vec[0] = (shi->flippednor) ? 0.0f : 1.0f;
-	}
-}
-
-static void node_shader_init_geometry(bNodeTree *UNUSED(ntree), bNode *node)
-{
-	node->storage = MEM_callocN(sizeof(NodeGeometry), "NodeGeometry");
-}
-
-static int gpu_shader_geom(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
-{
-	NodeGeometry *ngeo = (NodeGeometry *)node->storage;
-	GPUNodeLink *orco = GPU_attribute(CD_ORCO, "");
-	GPUNodeLink *mtface = GPU_attribute(CD_MTFACE, ngeo->uvname);
-	GPUNodeLink *mcol = GPU_attribute(CD_MCOL, ngeo->colname);
-
-	bool ret = GPU_stack_link(mat, "geom", in, out,
-	                      GPU_builtin(GPU_VIEW_POSITION), GPU_builtin(GPU_VIEW_NORMAL),
-	                      GPU_builtin(GPU_INVERSE_VIEW_MATRIX), orco, mtface, mcol);
-	if (GPU_material_use_world_space_shading(mat)) {
-		GPU_link(mat, "vec_math_negate", out[5].link, &out[5].link);
-		ret &= GPU_link(mat, "direction_transform_m4v3", out[5].link, GPU_builtin(GPU_INVERSE_VIEW_MATRIX), &out[5].link);
-	}
-	return ret;
-}
-
-/* node type definition */
-void register_node_type_sh_geom(void)
-{
-	static bNodeType ntype;
-
-	sh_node_type_base(&ntype, SH_NODE_GEOMETRY, "Geometry", NODE_CLASS_INPUT, 0);
-	node_type_compatibility(&ntype, NODE_OLD_SHADING);
-	node_type_socket_templates(&ntype, NULL, sh_node_geom_out);
-	node_type_init(&ntype, node_shader_init_geometry);
-	node_type_storage(&ntype, "NodeGeometry", node_free_standard_storage, node_copy_standard_storage);
-	node_type_exec(&ntype, NULL, NULL, node_shader_exec_geom);
-	node_type_gpu(&ntype, gpu_shader_geom);
-
-	nodeRegisterType(&ntype);
-}
diff --git a/source/blender/nodes/shader/nodes/node_shader_material.c b/source/blender/nodes/shader/nodes/node_shader_material.c
deleted file mode 100644
index 8a73ddc1194..00000000000
--- a/source/blender/nodes/shader/nodes/node_shader_material.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * 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.
- *
- * The Original Code is Copyright (C) 2005 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/nodes/shader/nodes/node_shader_material.c
- *  \ingroup shdnodes
- */
-
-#include "node_shader_util.h"
-
-/* **************** MATERIAL ******************** */
-
-static bNodeSocketTemplate sh_node_material_in[] = {
-	{	SOCK_RGBA, 1, N_("Color"),		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 1, N_("Spec"),		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("DiffuseIntensity"),		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_VECTOR, 1, N_("Normal"),	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_DIRECTION},
-	{	-1, 0, ""	}
-};
-
-static bNodeSocketTemplate sh_node_material_out[] = {
-	{	SOCK_RGBA, 0, N_("Color")},
-	{	SOCK_FLOAT, 0, N_("Alpha")},
-	{	SOCK_VECTOR, 0, N_("Normal")},
-	{	-1, 0, ""	}
-};
-
-/* **************** EXTENDED MATERIAL ******************** */
-
-static bNodeSocketTemplate sh_node_material_ext_in[] = {
-	{	SOCK_RGBA, 1, N_("Color"),		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 1, N_("Spec"),		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("DiffuseIntensity"),		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_VECTOR, 1, N_("Normal"),	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_DIRECTION},
-	{	SOCK_RGBA, 1, N_("Mirror"),		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Ambient"),	0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("Emit"),		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
-	{	SOCK_FLOAT, 1, N_("SpecTra"),	0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("Reflectivity"),	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("Alpha"),		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED},
-	{	SOCK_FLOAT, 1, N_("Translucency"),	0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""	}
-};
-
-static bNodeSocketTemplate sh_node_material_ext_out[] = {
-	{	SOCK_RGBA, 0, N_("Color")},
-	{	SOCK_FLOAT, 0, N_("Alpha")},
-	{	SOCK_VECTOR, 0, N_("Normal")},
-	{	SOCK_RGBA, 0, N_("Diffuse")},
-	{	SOCK_RGBA, 0, N_("Spec")},
-	{	SOCK_RGBA, 0, N_("AO")},
-	{	-1, 0, ""	}
-};
-
-static void node_shader_exec_material(void *data, int UNUSED(thread), bNode *node, bNodeExecData *execdata, bNodeStack **in, bNodeStack **out)
-{
-	if (data && node->id) {
-		ShadeResult shrnode;
-		ShadeInput *shi;
-		ShaderCallData *shcd = data;
-		float col[4];
-		bNodeSocket *sock;
-		char hasinput[NUM_MAT_IN] = {'\0'};
-		int i, mode;
-
-		/* note: cannot use the in[]->hasinput flags directly, as these are not necessarily
-		 * the constant input stack values (e.g. in case material node is inside a group).
-		 * we just want to know if a node input uses external data or the material setting.
-		 * this is an ugly hack, but so is this node as a whole.
-		 */
-		for (sock = node->inputs.first, i = 0; sock; sock = sock->next, ++i)
-			hasinput[i] = (sock->link != NULL);
-
-		shi = shcd->shi;
-		shi->mat = (Material *)node->id;
-
-		/* copy all relevant material vars, note, keep this synced with render_types.h */
-		memcpy(&shi->r, &shi->

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list