Revision: 36481
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36481
Author: lukastoenne
Date: 2011-05-04 11:42:25 +0000 (Wed, 04 May 2011)
Log Message:
-----------
Intermediate commit, ignore this. Need to do this because SVN is stupid and
doesn't accept removing+adding files in one go ...
Modified Paths:
--------------
branches/particles-2010/source/blender/blenkernel/BKE_node.h
branches/particles-2010/source/blender/blenkernel/intern/material.c
branches/particles-2010/source/blender/blenkernel/intern/node.c
branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
branches/particles-2010/source/blender/blenkernel/intern/texture.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_image.c
branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
branches/particles-2010/source/blender/editors/space_node/node_edit.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_common.c
branches/particles-2010/source/blender/nodes/intern/CMP_nodetree.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_common.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_math.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_output.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_value.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodetree.c
branches/particles-2010/source/blender/nodes/intern/SHD_util.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_at.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_common.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_image.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_math.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_output.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodetree.c
branches/particles-2010/source/blender/nodes/intern/TEX_util.c
branches/particles-2010/source/blender/nodes/intern/node_common.c
branches/particles-2010/source/blender/nodes/intern/node_exec.c
branches/particles-2010/source/blender/nodes/intern/node_exec.h
branches/particles-2010/source/blender/render/intern/source/render_texture.c
Removed Paths:
-------------
branches/particles-2010/release/scripts/io/
branches/particles-2010/release/scripts/keyingsets/
branches/particles-2010/release/scripts/modules/
branches/particles-2010/release/scripts/op/
branches/particles-2010/release/scripts/presets/
branches/particles-2010/release/scripts/templates/
branches/particles-2010/release/scripts/ui/
Modified: branches/particles-2010/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_node.h
2011-05-04 09:58:02 UTC (rev 36480)
+++ branches/particles-2010/source/blender/blenkernel/BKE_node.h
2011-05-04 11:42:25 UTC (rev 36481)
@@ -263,10 +263,6 @@
void (*freeNodeCache)(struct bNodeTree *ntree, struct bNode *node);
void (*foreachNodeTree)(struct Main *main, void *calldata,
bNodeTreeCallback func); /* iteration over all node trees */
- void (*exec_begin)(struct bNodeTreeExec *exec);
- void (*exec_end)(struct bNodeTreeExec *exec);
- void (*exec)(struct bNodeTreeExec *exec, void *callerdata, int thread);
-
/* calls allowing threaded composite */
void (*localize)(struct bNodeTree *localtree, struct bNodeTree *ntree);
void (*local_sync)(struct bNodeTree *localtree, struct bNodeTree
*ntree);
@@ -378,12 +374,6 @@
void nodeFreePreview(struct bNode *node);
-/* ************** EXECUTION *************** */
-
-struct bNodeTreeExec *ntreeBeginExecTree(struct bNodeTree *ntree);
-void ntreeExecTree(struct bNodeTreeExec *exec, void
*callerdata, int thread);
-void ntreeEndExecTree(struct bNodeTreeExec *exec);
-
/* ************** NODE TYPE ACCESS *************** */
struct bNodeTemplate nodeMakeTemplate(struct bNode *node);
@@ -497,6 +487,8 @@
/* API */
+struct bNodeTreeExec *ntreeShaderBeginExecTree(struct bNodeTree *ntree);
+void ntreeShaderEndExecTree(struct bNodeTreeExec *exec);
void ntreeShaderExecTree(struct bNodeTree *ntree, struct
ShadeInput *shi, struct ShadeResult *shr);
void ntreeShaderGetTexcoMode(struct bNodeTree *ntree, int
osa, short *texco, int *mode);
void nodeShaderSynchronizeID(struct bNode *node, int copyto);
@@ -622,6 +614,8 @@
/* API */
struct CompBuf;
+struct bNodeTreeExec *ntreeCompositBeginExecTree(struct bNodeTree *ntree);
+void ntreeCompositEndExecTree(struct bNodeTreeExec *exec);
void ntreeCompositExecTree(struct bNodeTree *ntree, struct RenderData *rd, int
do_previews);
void ntreeCompositTagRender(struct Scene *sce);
int ntreeCompositTagAnimated(struct bNodeTree *ntree);
@@ -665,11 +659,14 @@
/* API */
int ntreeTexTagAnimated(struct bNodeTree *ntree);
void ntreeTexSetPreviewFlag(int);
-int ntreeTexExecTree(struct bNodeTree *ntree, struct TexResult *target, float
*coord, float *dxt, float *dyt, int osatex, short thread, struct Tex *tex,
short which_output, int cfra, int preview, struct ShadeInput *shi, struct MTex
*mtex);
void ntreeTexCheckCyclics(struct bNodeTree *ntree);
char* ntreeTexOutputMenu(struct bNodeTree *ntree);
+struct bNodeTreeExec *ntreeTexBeginExecTree(struct bNodeTree *ntree);
+void ntreeTexEndExecTree(struct bNodeTreeExec *exec);
+int ntreeTexExecTree(struct bNodeTree *ntree, struct TexResult *target, float
*coord, float *dxt, float *dyt, int osatex, short thread, struct Tex *tex,
short which_output, int cfra, int preview, struct ShadeInput *shi, struct MTex
*mtex);
+
/*************************************************/
void init_nodesystem(void);
Modified: branches/particles-2010/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/particles-2010/source/blender/blenkernel/intern/material.c
2011-05-04 09:58:02 UTC (rev 36480)
+++ branches/particles-2010/source/blender/blenkernel/intern/material.c
2011-05-04 11:42:25 UTC (rev 36481)
@@ -901,7 +901,7 @@
init_render_nodetree(mat->nodetree, mat, r_mode, amb);
if (!mat->nodetree->execdata)
- mat->nodetree->execdata =
ntreeBeginExecTree(mat->nodetree);
+ mat->nodetree->execdata =
ntreeShaderBeginExecTree(mat->nodetree);
}
}
@@ -935,7 +935,7 @@
{
if(mat && mat->nodetree && mat->use_nodes) {
if (mat->nodetree->execdata)
- ntreeEndExecTree(mat->nodetree->execdata);
+ ntreeShaderEndExecTree(mat->nodetree->execdata);
}
}
Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-04 09:58:02 UTC (rev 36480)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c
2011-05-04 11:42:25 UTC (rev 36481)
@@ -1756,6 +1756,7 @@
}
+#if 0
/* ******************* executing ************* */
bNodeTreeExec *ntreeBeginExecTree(bNodeTree *ntree)
{
@@ -1790,6 +1791,7 @@
ntree_exec(exec, callerdata, thread);
}
}
+#endif
/* ************* node type access ********** */
Modified:
branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
2011-05-04 09:58:02 UTC (rev 36480)
+++ branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
2011-05-04 11:42:25 UTC (rev 36481)
@@ -4907,6 +4907,7 @@
}
}
+ #if 0
/**** particles-2010 ****/
/* Execute the particle simulation node tree */
if (psys->nodetree) {
@@ -4917,6 +4918,7 @@
ntreeEndExecTree(execdata);
}
/************************/
+ #endif
if(psys->cfra < cfra) {
/* make sure emitter is left at correct time (particle emission
can change this) */
Modified: branches/particles-2010/source/blender/blenkernel/intern/texture.c
===================================================================
--- branches/particles-2010/source/blender/blenkernel/intern/texture.c
2011-05-04 09:58:02 UTC (rev 36480)
+++ branches/particles-2010/source/blender/blenkernel/intern/texture.c
2011-05-04 11:42:25 UTC (rev 36481)
@@ -769,7 +769,7 @@
if(tex->nodetree) {
if (tex->nodetree->execdata) {
- ntreeEndExecTree(tex->nodetree->execdata);
+ ntreeTexEndExecTree(tex->nodetree->execdata);
tex->nodetree->execdata = NULL;
}
texn->nodetree= ntreeCopyTree(tex->nodetree);
Modified:
branches/particles-2010/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- branches/particles-2010/source/blender/editors/sculpt_paint/paint_image.c
2011-05-04 09:58:02 UTC (rev 36480)
+++ branches/particles-2010/source/blender/editors/sculpt_paint/paint_image.c
2011-05-04 11:42:25 UTC (rev 36481)
@@ -4656,7 +4656,7 @@
if(brush) {
MTex *mtex= &brush->mtex;
if(mtex->tex && mtex->tex->nodetree)
- ntreeBeginExecTree(mtex->tex->nodetree); /* has
internal flag to detect it only does it once */
+ ntreeTexBeginExecTree(mtex->tex->nodetree); /* has
internal flag to detect it only does it once */
}
}
@@ -4798,7 +4798,7 @@
if(brush) {
MTex *mtex= &brush->mtex;
if(mtex->tex && mtex->tex->nodetree)
- ntreeEndExecTree(mtex->tex->nodetree->execdata);
+ ntreeTexEndExecTree(mtex->tex->nodetree->execdata);
}
}
Modified: branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
2011-05-04 09:58:02 UTC (rev 36480)
+++ branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
2011-05-04 11:42:25 UTC (rev 36481)
@@ -3340,7 +3340,7 @@
/* init mtex nodes */
if(mtex->tex && mtex->tex->nodetree)
- ntreeBeginExecTree(mtex->tex->nodetree); /* has internal flag
to detect it only does it once */
+ ntreeTexBeginExecTree(mtex->tex->nodetree); /* has internal
flag to detect it only does it once */
/* TODO: Shouldn't really have to do this at the start of every
stroke, but sculpt would need some sort of notification when
@@ -3515,7 +3515,7 @@
MTex *mtex= &brush->mtex;
if(mtex->tex && mtex->tex->nodetree)
- ntreeEndExecTree(mtex->tex->nodetree->execdata);
+ ntreeTexEndExecTree(mtex->tex->nodetree->execdata);
}
static void sculpt_stroke_done(bContext *C, struct PaintStroke *unused)
Modified: branches/particles-2010/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/particles-2010/source/blender/editors/space_node/node_edit.c
2011-05-04 09:58:02 UTC (rev 36480)
+++ branches/particles-2010/source/blender/editors/space_node/node_edit.c
2011-05-04 11:42:25 UTC (rev 36481)
@@ -894,7 +894,6 @@
int in_out= -1;
char name[32]= "";
int type= SOCK_VALUE;
- PropertySubType subtype;
bNodeTree *ngroup= snode->edittree;
bNodeSocket *sock;
Modified:
branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_common.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_common.c
2011-05-04 09:58:02 UTC (rev 36480)
+++ branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_common.c
2011-05-04 11:42:25 UTC (rev 36481)
@@ -41,7 +41,7 @@
#include "../node_common.h"
#include "../node_exec.h"
-#if 1
+#if 0
static void PRINT_BUFFERS(bNodeTreeExec *exec)
{
bNodeTree *ntree= exec->nodetree;
@@ -122,7 +122,7 @@
bNodeStack *ns;
/* initialize the internal node tree execution */
- exec = ntree_exec_begin(ngroup);
+ exec = ntreeCompositBeginExecTree(ngroup);
/* tag group outputs as external to prevent freeing */
for (sock=ngroup->outputs.first; sock; sock=sock->next) {
@@ -139,7 +139,7 @@
{
bNodeTreeExec *gexec= (bNodeTreeExec*)nodedata;
- ntree_exec_end(gexec);
+ ntreeCompositEndExecTree(gexec);
}
/* Copy inputs to the internal stack.
@@ -202,7 +202,7 @@
}
group_copy_inputs(node, in, exec->stack);
- ntree_exec(exec, data, thread);
+ ntreeExecNodes(exec, data, thread);
group_free_internal(exec);
group_move_outputs(node, out, exec->stack);
}
@@ -284,7 +284,7 @@
if (iteration > 0)
loop_iteration_reset(exec->nodetree, exec->stack);
- ntree_exec(exec, data, thread);
+ ntreeExecNodes(exec, data, thread);
group_free_internal(exec);
}
group_move_outputs(node, out, exec->stack);
@@ -338,7 +338,7 @@
while (condition && iteration < node->custom1) {
if (iteration > 0)
loop_iteration_reset(exec->nodetree, exec->stack);
- ntree_exec(exec, data, thread);
+ ntreeExecNodes(exec, data, thread);
group_free_internal(exec);
// PRINT_BUFFERS(exec);
Modified: branches/particles-2010/source/blender/nodes/intern/CMP_nodetree.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/CMP_nodetree.c
2011-05-04 09:58:02 UTC (rev 36480)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
