[Bf-blender-cvs] [39dc956] soc-2013-rigid_body_sim: Merge branch 'master' into soc-2013-rigid_body_sim

Sergej Reich noreply at git.blender.org
Sat Nov 23 17:19:22 CET 2013


Commit: 39dc956f593b3406bf1d81fb83c557b7b51f5327
Author: Sergej Reich
Date:   Sat Nov 23 17:17:12 2013 +0100
http://developer.blender.org/rB39dc956f593b3406bf1d81fb83c557b7b51f5327

Merge branch 'master' into soc-2013-rigid_body_sim

Conflicts:
	intern/rigidbody/CMakeLists.txt
	release/datafiles/splash.png
	source/blender/editors/space_view3d/drawobject.c
	source/blender/makesdna/DNA_view3d_types.h

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



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

diff --cc intern/rigidbody/CMakeLists.txt
index 80ea567,5d84c2c..f01ca12
--- a/intern/rigidbody/CMakeLists.txt
+++ b/intern/rigidbody/CMakeLists.txt
@@@ -23,9 -23,6 +23,8 @@@
  
  set(INC
  	.
 +	../../source/blender/gpu
- 	../../extern/bullet2/src
 +	../../extern/HACD
  )
  
  set(INC_SYS
diff --cc source/blender/editors/space_view3d/drawobject.c
index 1ea1dcf,ee9ed96..9c053ee
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@@ -7156,27 -7113,22 +7176,27 @@@ void draw_object(Scene *scene, ARegion 
  		}
  	}
  
- 	if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
+ 	if (!render_override) {
 -		bConstraint *con;
 -
 -		for (con = ob->constraints.first; con; con = con->next) {
 -			if (con->type == CONSTRAINT_TYPE_RIGIDBODYJOINT) {
 -				bRigidBodyJointConstraint *data = (bRigidBodyJointConstraint *)con->data;
 -				if (data->flag & CONSTRAINT_DRAW_PIVOT)
 -					draw_rigid_body_pivot(data, dflag, ob_wire_col);
 +		if ((v3d->flag2 & V3D_NO_PHYSICS) == 0) {
 +			bConstraint *con;
 +
 +			for (con = ob->constraints.first; con; con = con->next) {
 +				if (con->type == CONSTRAINT_TYPE_RIGIDBODYJOINT) {
 +					bRigidBodyJointConstraint *data = (bRigidBodyJointConstraint *)con->data;
 +					if (data->flag & CONSTRAINT_DRAW_PIVOT)
 +						draw_rigid_body_pivot(data, dflag, ob_wire_col);
 +				}
  			}
 -		}
  
 -		if ((ob->gameflag & OB_BOUNDS) && (ob->mode == OB_MODE_OBJECT)) {
 -			if (ob->boundtype != ob->collision_boundtype || (dtx & OB_DRAWBOUNDOX) == 0) {
 -				setlinestyle(2);
 -				draw_bounding_volume(scene, ob, ob->collision_boundtype);
 -				setlinestyle(0);
 +			if (ob->gameflag & OB_BOUNDS) {
 +				if (ob->boundtype != ob->collision_boundtype || (dtx & OB_DRAWBOUNDOX) == 0) {
 +					setlinestyle(2);
 +					draw_bounding_volume(scene, ob, ob->collision_boundtype);
 +					setlinestyle(0);
 +				}
 +			}
 +			if (ob->rigidbody_object) {
 +				draw_rigidbody_shape(ob);
  			}
  		}
  
diff --cc source/blender/makesdna/DNA_view3d_types.h
index 155f41b,c724340..5eba850
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@@ -280,7 -280,7 +280,8 @@@ typedef struct View3D 
  #define V3D_SOLID_MATCAP		4096	/* user flag */
  #define V3D_SHOW_SOLID_MATCAP	8192	/* runtime flag */
  #define V3D_OCCLUDE_WIRE		16384
- #define V3D_NO_PHYSICS			32768
+ #define V3D_SHADELESS_TEX		32768
++#define V3D_NO_PHYSICS			32768 // RB_FIXME need new drawing flag
  
  
  /* View3D->around */




More information about the Bf-blender-cvs mailing list