[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22029] branches/soc-2009-yukishiro/source /blender: some more clean-up work

Jingyuan Huang jingyuan.huang at gmail.com
Thu Jul 30 00:01:45 CEST 2009


Revision: 22029
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22029
Author:   yukishiro
Date:     2009-07-30 00:01:44 +0200 (Thu, 30 Jul 2009)

Log Message:
-----------
some more clean-up work

Modified Paths:
--------------
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_node.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/lightenv.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/node.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c
    branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
    branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_light.c
    branches/soc-2009-yukishiro/source/blender/editors/space_node/drawnode.c
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2009-yukishiro/source/blender/render/intern/source/occlusion.c

Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_node.h	2009-07-29 21:35:03 UTC (rev 22028)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_node.h	2009-07-29 22:01:44 UTC (rev 22029)
@@ -418,7 +418,6 @@
 #define TEX_NODE_PROC      500
 #define TEX_NODE_PROC_MAX  600
 
-
 extern struct ListBase node_all_textures;
 
 /* API */
@@ -435,5 +434,4 @@
 void init_nodesystem(void);
 void free_nodesystem(void);
 
-
 #endif

Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/DerivedMesh.c	2009-07-29 21:35:03 UTC (rev 22028)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/DerivedMesh.c	2009-07-29 22:01:44 UTC (rev 22029)
@@ -1562,7 +1562,6 @@
 	stored_cb= coba;
 }
 
-
 static void add_weight_mcol_dm(Object *ob, DerivedMesh *dm)
 {
 	Mesh *me = ob->data;

Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/lightenv.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/lightenv.c	2009-07-29 21:35:03 UTC (rev 22028)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/lightenv.c	2009-07-29 22:01:44 UTC (rev 22029)
@@ -34,9 +34,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BKE_blender.h"
-#include "BKE_displist.h"
 #include "BKE_global.h"
+#include "BKE_icons.h"
 #include "BKE_image.h"
 #include "BKE_library.h"
 #include "BKE_main.h"

Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/node.c	2009-07-29 21:35:03 UTC (rev 22028)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/node.c	2009-07-29 22:01:44 UTC (rev 22029)
@@ -1057,11 +1057,11 @@
 	ntree->alltypes.last = NULL;
 
 	/* this helps RNA identify ID pointers as nodetree */
-	if(ntree->type==NTREE_SHADER)
+    if(ntree->type==NTREE_SHADER)
 		BLI_strncpy(ntree->id.name, "NTShader Nodetree", sizeof(ntree->id.name));
-	else if(ntree->type==NTREE_COMPOSIT)
+    else if(ntree->type==NTREE_COMPOSIT)
 		BLI_strncpy(ntree->id.name, "NTComposit Nodetree", sizeof(ntree->id.name));
-	else if(ntree->type==NTREE_TEXTURE)
+    else if(ntree->type==NTREE_TEXTURE)
 		BLI_strncpy(ntree->id.name, "NTTexture Nodetree", sizeof(ntree->id.name));
 	
 	ntreeInitTypes(ntree);
@@ -3066,7 +3066,6 @@
 	nodeRegisterType(ntypelist, &tex_node_proc_distnoise);
 }
 
-
 static void remove_dynamic_typeinfos(ListBase *list)
 {
 	bNodeType *ntype= list->first;

Modified: branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c	2009-07-29 21:35:03 UTC (rev 22028)
+++ branches/soc-2009-yukishiro/source/blender/blenkernel/intern/scene.c	2009-07-29 22:01:44 UTC (rev 22029)
@@ -44,7 +44,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_anim_types.h"
-#include "DNA_armature_types.h"
+#include "DNA_armature_types.h"	
 #include "DNA_color_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_curve_types.h"
@@ -57,10 +57,10 @@
 #include "DNA_texture_types.h"
 #include "DNA_userdef_types.h"
 
-#include "BKE_action.h"
+#include "BKE_action.h"			
 #include "BKE_anim.h"
 #include "BKE_animsys.h"
-#include "BKE_armature.h"
+#include "BKE_armature.h"		
 #include "BKE_colortools.h"
 #include "BKE_colortools.h"
 #include "BKE_constraint.h"

Modified: branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c	2009-07-29 21:35:03 UTC (rev 22028)
+++ branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c	2009-07-29 22:01:44 UTC (rev 22029)
@@ -406,7 +406,6 @@
 		}
 		else if(id_type==ID_LE) {
 			sce->lightenv = (LightEnv *)id;
-			sce->r.scemode |= R_LIGHTENV;
 		}
 		
 		return sce;

Modified: branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_light.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_light.c	2009-07-29 21:35:03 UTC (rev 22028)
+++ branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/paint_light.c	2009-07-29 22:01:44 UTC (rev 22029)
@@ -580,7 +580,7 @@
 	switch(event->type) {
 		case MOUSEMOVE: // use trackball
 		{
-			float phi, si, rvec[4], dvec[3], newvec[3];
+			float si, rvec[4], dvec[3], newvec[3];
 			calctrackballvec(&rop->ar->winrct, event->x, event->y, newvec);
 
 			VecSubf(dvec, newvec, rop->trackvec);

Modified: branches/soc-2009-yukishiro/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/space_node/drawnode.c	2009-07-29 21:35:03 UTC (rev 22028)
+++ branches/soc-2009-yukishiro/source/blender/editors/space_node/drawnode.c	2009-07-29 22:01:44 UTC (rev 22029)
@@ -2397,7 +2397,7 @@
 
 		/* browse button lightenv */
 		uiBlockBeginAlign(block);
-		IDnames_to_pupstring(&strp, NULL, "", &(node->id), NULL, NULL);
+		IDnames_to_pupstring(&strp, NULL, "", &(G.main->lightenv), NULL, NULL);
 		node->menunr= 0;
 		bt= uiDefButS(block, MENU, B_NOP, strp,
 			butr->xmin, butr->ymin, 19, 19, &node->menunr, 0, 0, 0, 0, 

Modified: branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h	2009-07-29 21:35:03 UTC (rev 22028)
+++ branches/soc-2009-yukishiro/source/blender/makesdna/DNA_scene_types.h	2009-07-29 22:01:44 UTC (rev 22029)
@@ -780,7 +780,6 @@
 #define R_FULL_SAMPLE		0x8000
 #define R_COMP_RERENDER		0x10000
 #define R_RECURS_PROTECTION     0x20000
-#define R_LIGHTENV		0x40000
 
 /* r->stamp */
 #define R_STAMP_TIME 	0x0001

Modified: branches/soc-2009-yukishiro/source/blender/render/intern/source/occlusion.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/render/intern/source/occlusion.c	2009-07-29 21:35:03 UTC (rev 22028)
+++ branches/soc-2009-yukishiro/source/blender/render/intern/source/occlusion.c	2009-07-29 22:01:44 UTC (rev 22029)
@@ -349,10 +349,11 @@
 static void occ_node_from_face(OccFace *face, OccNode *node)
 {
 	float n[3];
+	int sh_degree = 2;
 
 	occ_face(face, node->co, n, &node->area);
 	node->dco= 0.0f;
-	SH_from_disc(2, n, node->area, node->sh); // sh degree = 2
+	SH_from_disc(sh_degree, n, node->area, node->sh); 
 }
 
 static void occ_build_dco(OcclusionTree *tree, OccNode *node, float *co, float *dco)





More information about the Bf-blender-cvs mailing list