[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29833] branches/soc-2010-leifandersen: NOTE: Concerning my last commit message, I also forgot to say that I also change the file iterator, so that it only tried files with .blend in the name, as apposed to all files with a list of exceptions.

Leif Andersen leif.a.andersen at gmail.com
Wed Jun 30 20:22:20 CEST 2010


Revision: 29833
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29833
Author:   leifandersen
Date:     2010-06-30 20:22:20 +0200 (Wed, 30 Jun 2010)

Log Message:
-----------
NOTE:  Concerning my last commit message, I also forgot to say that I also change the file iterator, so that it only tried files with .blend in the name, as apposed to all files with a list of exceptions.

Merge with trunk: svn merge -r 29750:29831 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ .

No merge conflicts.  Also it's a bit earlier than I usualy do it, but I don't plan on doing it again until I get back (do to poor internet connectivity), so I'm doing it now.

Modified Paths:
--------------
    branches/soc-2010-leifandersen/release/scripts/ui/properties_object.py
    branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_softbody.py
    branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_displist.h
    branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_image.h
    branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_lattice.h
    branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_mball.h
    branches/soc-2010-leifandersen/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2010-leifandersen/source/blender/blenkernel/intern/displist.c
    branches/soc-2010-leifandersen/source/blender/blenkernel/intern/image.c
    branches/soc-2010-leifandersen/source/blender/blenkernel/intern/lattice.c
    branches/soc-2010-leifandersen/source/blender/blenkernel/intern/mball.c
    branches/soc-2010-leifandersen/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2010-leifandersen/source/blender/blenkernel/intern/particle.c
    branches/soc-2010-leifandersen/source/blender/blenkernel/intern/texture.c
    branches/soc-2010-leifandersen/source/blender/blenlib/intern/BLI_args.c
    branches/soc-2010-leifandersen/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-leifandersen/source/blender/editors/interface/interface_handlers.c
    branches/soc-2010-leifandersen/source/blender/editors/interface/interface_templates.c
    branches/soc-2010-leifandersen/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2010-leifandersen/source/blender/editors/object/object_relations.c
    branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2010-leifandersen/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-leifandersen/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2010-leifandersen/source/blender/editors/transform/transform.c
    branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2010-leifandersen/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    branches/soc-2010-leifandersen/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-leifandersen/source/blender/render/intern/source/convertblender.c
    branches/soc-2010-leifandersen/source/blender/render/intern/source/rayshade.c
    branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_keymap.c

Added Paths:
-----------
    branches/soc-2010-leifandersen/source/blender/makesrna/rna_cleanup/
    branches/soc-2010-leifandersen/source/blender/makesrna/rna_cleanup/rna_booleans.txt
    branches/soc-2010-leifandersen/source/blender/makesrna/rna_cleanup/rna_cleaner.py

Removed Paths:
-------------
    branches/soc-2010-leifandersen/source/blender/makesrna/rna_cleanup/rna_booleans.txt
    branches/soc-2010-leifandersen/source/blender/makesrna/rna_cleanup/rna_cleaner.py

Modified: branches/soc-2010-leifandersen/release/scripts/ui/properties_object.py
===================================================================
--- branches/soc-2010-leifandersen/release/scripts/ui/properties_object.py	2010-06-30 18:16:52 UTC (rev 29832)
+++ branches/soc-2010-leifandersen/release/scripts/ui/properties_object.py	2010-06-30 18:22:20 UTC (rev 29833)
@@ -214,7 +214,7 @@
         col.prop(ob, "draw_name", text="Name")
         col.prop(ob, "draw_axis", text="Axis")
         col.prop(ob, "draw_wire", text="Wire")
-        col.prop(ob, "color", text="")
+        col.prop(ob, "color", text="Object Color")
 
         if wide_ui:
             col = split.column()

Modified: branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_softbody.py
===================================================================
--- branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_softbody.py	2010-06-30 18:16:52 UTC (rev 29832)
+++ branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_softbody.py	2010-06-30 18:22:20 UTC (rev 29833)
@@ -186,10 +186,13 @@
         sub.active = softbody.stiff_quads
         sub.prop(softbody, "shear")
 
-        col.prop(softbody, "new_aero", text="Aero")
-        sub = col.column()
-        sub.enabled = softbody.new_aero
-        sub.prop(softbody, "aero", text="Factor")
+        col.label(text="Aerodynamics:")
+        col.row().prop(softbody, "aerodynamics_type", expand=True)
+        col.prop(softbody, "aero", text="Factor")
+        
+        #sub = col.column()
+        #sub.enabled = softbody.aero > 0
+        
 
         col.label(text="Collision:")
         col.prop(softbody, "edge_collision", text="Edge")

Modified: branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_displist.h
===================================================================
--- branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_displist.h	2010-06-30 18:16:52 UTC (rev 29832)
+++ branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_displist.h	2010-06-30 18:22:20 UTC (rev 29833)
@@ -93,6 +93,7 @@
 extern void makeDispListCurveTypes_forRender(struct Scene *scene, struct Object *ob, struct ListBase *dispbase, struct DerivedMesh **derivedFinal, int forOrco);
 extern void makeDispListCurveTypes_forOrco(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
 extern void makeDispListMBall(struct Scene *scene, struct Object *ob);
+extern void makeDispListMBall_forRender(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
 extern void shadeDispList(struct Scene *scene, struct Base *base);
 extern void shadeMeshMCol(struct Scene *scene, struct Object *ob, struct Mesh *me);
 

Modified: branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_image.h
===================================================================
--- branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_image.h	2010-06-30 18:16:52 UTC (rev 29832)
+++ branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_image.h	2010-06-30 18:22:20 UTC (rev 29833)
@@ -115,7 +115,7 @@
 struct Image *BKE_add_image_file(const char *name, int frame);
 
 /* adds image, adds ibuf, generates color or pattern */
-struct Image *BKE_add_image_size(int width, int height, char *name, int floatbuf, short uvtestgrid, float color[4]);
+struct Image *BKE_add_image_size(int width, int height, char *name, int depth, int floatbuf, short uvtestgrid, float color[4]);
 /* adds image from imbuf, owns imbuf */
 struct Image *BKE_add_image_imbuf(struct ImBuf *ibuf);
 

Modified: branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_lattice.h
===================================================================
--- branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_lattice.h	2010-06-30 18:16:52 UTC (rev 29832)
+++ branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_lattice.h	2010-06-30 18:22:20 UTC (rev 29833)
@@ -49,7 +49,7 @@
 void calc_latt_deform(struct Object *, float *co, float weight);
 void end_latt_deform(struct Object *);
 
-int object_deform_mball(struct Object *ob);
+int object_deform_mball(struct Object *ob, struct ListBase *dispbase);
 void outside_lattice(struct Lattice *lt);
 
 void curve_deform_verts(struct Scene *scene, struct Object *cuOb, struct Object *target, 

Modified: branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_mball.h
===================================================================
--- branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_mball.h	2010-06-30 18:16:52 UTC (rev 29832)
+++ branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_mball.h	2010-06-30 18:22:20 UTC (rev 29833)
@@ -164,12 +164,12 @@
 struct MetaBall *copy_mball(struct MetaBall *mb);
 void make_local_mball(struct MetaBall *mb);
 void tex_space_mball(struct Object *ob);
-float *make_orco_mball(struct Object *ob);
+float *make_orco_mball(struct Object *ob, struct ListBase *dispbase);
 void copy_mball_properties(struct Scene *scene, struct Object *active_object);
 struct Object *find_basis_mball(struct Scene *scene, struct Object *ob);
 int is_basis_mball(struct Object *ob);
 int is_mball_basis_for(struct Object *ob1, struct Object *ob2);
-void metaball_polygonize(struct Scene *scene, struct Object *ob);
+void metaball_polygonize(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
 void calc_mballco(struct MetaElem *ml, float *vec);
 float densfunc(struct MetaElem *ball, float x, float y, float z);
 float metaball(float x, float y, float z);

Modified: branches/soc-2010-leifandersen/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2010-leifandersen/source/blender/blenkernel/intern/cdderivedmesh.c	2010-06-30 18:16:52 UTC (rev 29832)
+++ branches/soc-2010-leifandersen/source/blender/blenkernel/intern/cdderivedmesh.c	2010-06-30 18:22:20 UTC (rev 29833)
@@ -885,7 +885,7 @@
 				else
 					orig = actualFace;
 
-				if(setDrawOptions && !setDrawOptions(userData, orig, &drawSmooth))
+				if(draw && setDrawOptions && !setDrawOptions(userData, orig, &drawSmooth))
 					draw = 0;
 
 				/* Goal is to draw as long of a contiguous triangle

Modified: branches/soc-2010-leifandersen/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/soc-2010-leifandersen/source/blender/blenkernel/intern/displist.c	2010-06-30 18:16:52 UTC (rev 29832)
+++ branches/soc-2010-leifandersen/source/blender/blenkernel/intern/displist.c	2010-06-30 18:22:20 UTC (rev 29833)
@@ -1172,20 +1172,30 @@
 {
 	if(!ob || ob->type!=OB_MBALL) return;
 
+	// XXX: mball stuff uses plenty of global variables
+	//      while this is unchanged updating during render is unsafe
+	if(G.rendering) return;
+
 	freedisplist(&(ob->disp));
-	
+
 	if(ob->type==OB_MBALL) {
 		if(ob==find_basis_mball(scene, ob)) {
-			metaball_polygonize(scene, ob);
+			metaball_polygonize(scene, ob, &ob->disp);
 			tex_space_mball(ob);
 
-			object_deform_mball(ob);
+			object_deform_mball(ob, &ob->disp);
 		}
 	}
 	
 	boundbox_displist(ob);
 }
 
+void makeDispListMBall_forRender(Scene *scene, Object *ob, ListBase *dispbase)
+{
+	metaball_polygonize(scene, ob, dispbase);
+	object_deform_mball(ob, dispbase);
+}
+
 static ModifierData *curve_get_tesselate_point(Scene *scene, Object *ob, int forRender, int editmode)
 {
 	ModifierData *md = modifiers_getVirtualModifierList(ob);

Modified: branches/soc-2010-leifandersen/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2010-leifandersen/source/blender/blenkernel/intern/image.c	2010-06-30 18:16:52 UTC (rev 29832)
+++ branches/soc-2010-leifandersen/source/blender/blenkernel/intern/image.c	2010-06-30 18:22:20 UTC (rev 29833)
@@ -380,18 +380,18 @@
 	return ima;
 }
 
-static ImBuf *add_ibuf_size(int width, int height, char *name, int floatbuf, short uvtestgrid, float color[4])
+static ImBuf *add_ibuf_size(int width, int height, char *name, int depth, int floatbuf, short uvtestgrid, float color[4])
 {
 	ImBuf *ibuf;
 	unsigned char *rect= NULL;
 	float *rect_float= NULL;
 	
 	if (floatbuf) {
-		ibuf= IMB_allocImBuf(width, height, 24, IB_rectfloat, 0);
+		ibuf= IMB_allocImBuf(width, height, depth, IB_rectfloat, 0);
 		rect_float= (float*)ibuf->rect_float;
 	}
 	else {
-		ibuf= IMB_allocImBuf(width, height, 24, IB_rect, 0);
+		ibuf= IMB_allocImBuf(width, height, depth, IB_rect, 0);
 		rect= (unsigned char*)ibuf->rect;
 	}
 	
@@ -413,7 +413,7 @@
 }
 
 /* adds new image block, creates ImBuf and initializes color */
-Image *BKE_add_image_size(int width, int height, char *name, int floatbuf, short uvtestgrid, float color[4])
+Image *BKE_add_image_size(int width, int height, char *name, int depth, int floatbuf, short uvtestgrid, float color[4])
 {
 	/* on save, type is changed to FILE in editsima.c */
 	Image *ima= image_alloc(name, IMA_SRC_GENERATED, IMA_TYPE_UV_TEST);
@@ -426,7 +426,7 @@
 		ima->gen_y= height;
 		ima->gen_type= uvtestgrid;
 		
-		ibuf= add_ibuf_size(width, height, name, floatbuf, uvtestgrid, color);
+		ibuf= add_ibuf_size(width, height, name, depth, floatbuf, uvtestgrid, color);
 		image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
 		
 		ima->ok= IMA_OK_LOADED;
@@ -2075,7 +2075,7 @@
 				/* UV testgrid or black or solid etc */
 				if(ima->gen_x==0) ima->gen_x= 1024;
 				if(ima->gen_y==0) ima->gen_y= 1024;
-				ibuf= add_ibuf_size(ima->gen_x, ima->gen_y, ima->name, 0, ima->gen_type, color);
+				ibuf= add_ibuf_size(ima->gen_x, ima->gen_y, ima->name, 24, 0, ima->gen_type, color);
 				image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
 				ima->ok= IMA_OK_LOADED;
 			}

Modified: branches/soc-2010-leifandersen/source/blender/blenkernel/intern/lattice.c
===================================================================
--- branches/soc-2010-leifandersen/source/blender/blenkernel/intern/lattice.c	2010-06-30 18:16:52 UTC (rev 29832)
+++ branches/soc-2010-leifandersen/source/blender/blenkernel/intern/lattice.c	2010-06-30 18:22:20 UTC (rev 29833)
@@ -869,12 +869,12 @@
 	end_latt_deform(laOb);
 }
 
-int object_deform_mball(Object *ob)
+int object_deform_mball(Object *ob, ListBase *dispbase)
 {
 	if(ob->parent && ob->parent->type==OB_LATTICE && ob->partype==PARSKEL) {
 		DispList *dl;
 
-		for (dl=ob->disp.first; dl; dl=dl->next) {

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list