[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29037] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 29030.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Thu May 27 23:51:16 CEST 2010


Revision: 29037
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29037
Author:   kjym3
Date:     2010-05-27 23:51:16 +0200 (Thu, 27 May 2010)

Log Message:
-----------
Merged changes in the trunk up to revision 29030.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29030

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/SConstruct
    branches/soc-2008-mxcurioni/release/datafiles/blenderbuttons
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sca.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/threads.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/space_info.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_shader_ext.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/nan_definitions.mk

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2010-05-27 21:43:15 UTC (rev 29036)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2010-05-27 21:51:16 UTC (rev 29037)
@@ -92,7 +92,7 @@
 	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
 ELSE()
 	OPTION(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
-	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	ON)
+	OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
 ENDIF()
 
 IF (APPLE)
@@ -416,7 +416,7 @@
 
 	SET(TIFF ${LIBDIR}/tiff)
 	SET(TIFF_INCLUDE_DIR ${TIFF}/include)
-	SET(TIFF_LIBRARY tiff)
+	SET(TIFF_LIBRARY libtiff)
 	SET(TIFF_LIBPATH ${TIFF}/lib)
   
 	SET(WINTAB_INC ${LIBDIR}/wintab/include) 

Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct	2010-05-27 21:43:15 UTC (rev 29036)
+++ branches/soc-2008-mxcurioni/SConstruct	2010-05-27 21:51:16 UTC (rev 29037)
@@ -569,9 +569,9 @@
 
 	#currently win64-vc doesn't appear to have libpng.dll
 	if env['OURPLATFORM'] != 'win64-vc':
-		dllsources += ['${BF_PNG_LIBPATH}/libpng.dll',
-				'${BF_ZLIB_LIBPATH}/zlib.dll']
+		dllsources += ['${BF_PNG_LIBPATH}/libpng.dll']
 
+	dllsources += ['${BF_ZLIB_LIBPATH}/zlib.dll']
 	# Used when linking to libtiff was dynamic
 	# keep it here until compilation on all platform would be ok
 	# dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']

Modified: branches/soc-2008-mxcurioni/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)

Modified: branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py	2010-05-27 21:43:15 UTC (rev 29036)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py	2010-05-27 21:51:16 UTC (rev 29037)
@@ -76,7 +76,7 @@
                 else:
                     layout.prop_object(con, "subtarget", con.target.data, "bones", text="")
 
-                if con.type in ('COPY_LOCATION', 'STRETCH_TO', 'TRACK_TO'):
+                if con.type in ('COPY_LOCATION', 'STRETCH_TO', 'TRACK_TO', 'PIVOT'):
                     row = layout.row()
                     row.label(text="Head/Tail:")
                     row.prop(con, "head_tail", text="")
@@ -730,7 +730,23 @@
             col.prop(con, "xz_scaling_mode", text="")
         col.prop(con, "use_curve_radius")
 
+    def PIVOT(self, context, layout, con, wide_ui):
+        self.target_template(layout, con, wide_ui)
 
+        if con.target:
+            col = layout.column()
+            col.prop(con, "offset", text="Pivot Offset")
+        else:
+            col = layout.column()
+            col.prop(con, "use_relative_position")
+            if con.use_relative_position:  
+                col.prop(con, "offset", text="Relative Pivot Point")
+            else:
+                col.prop(con, "offset", text="Absolute Pivot Point")
+
+        col = layout.column()
+        col.prop(con, "enabled_rotation_range", text="Pivot When")
+
 class OBJECT_PT_constraints(ConstraintButtonsPanel):
     bl_label = "Object Constraints"
     bl_context = "constraint"

Modified: branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py	2010-05-27 21:43:15 UTC (rev 29036)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py	2010-05-27 21:51:16 UTC (rev 29037)
@@ -561,6 +561,10 @@
             ui = theme.user_interface.wcol_scroll
             col.label(text="Scroll Bar:")
             ui_items_general(col, ui)
+            
+            ui = theme.user_interface.wcol_progress
+            col.label(text="Progress Bar:")
+            ui_items_general(col, ui)
 
             ui = theme.user_interface.wcol_list_item
             col.label(text="List Item:")

Modified: branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py	2010-05-27 21:43:15 UTC (rev 29036)
+++ branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py	2010-05-27 21:51:16 UTC (rev 29037)
@@ -797,6 +797,7 @@
         layout = self.layout
 
         layout.operator("object.constraint_add_with_targets")
+        layout.operator("object.constraints_copy")
         layout.operator("object.constraints_clear")
 
 
@@ -1160,6 +1161,7 @@
         layout = self.layout
 
         layout.operator("pose.constraint_add_with_targets", text="Add (With Targets)...")
+        layout.operator("pose.constraints_copy")
         layout.operator("pose.constraints_clear")
 
 

Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c	2010-05-27 21:43:15 UTC (rev 29036)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c	2010-05-27 21:51:16 UTC (rev 29037)
@@ -52,6 +52,7 @@
 #include "BKE_anim.h"
 #include "BKE_curve.h"
 #include "BKE_DerivedMesh.h"
+#include "BKE_depsgraph.h"
 #include "BKE_font.h"
 #include "BKE_group.h"
 #include "BKE_global.h"

Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c	2010-05-27 21:43:15 UTC (rev 29036)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c	2010-05-27 21:51:16 UTC (rev 29037)
@@ -820,12 +820,12 @@
 		
 		/* extract components of both matrices */
 		VECCOPY(loc, ct->matrix[3]);
-		mat4_to_eulO( eul, ct->rotOrder,ct->matrix);
-		mat4_to_size( size,ct->matrix);
+		mat4_to_eulO(eul, ct->rotOrder, ct->matrix);
+		mat4_to_size(size, ct->matrix);
 		
 		VECCOPY(loco, invmat[3]);
-		mat4_to_eulO( eulo, cob->rotOrder,invmat);
-		mat4_to_size( sizo,invmat);
+		mat4_to_eulO(eulo, cob->rotOrder, invmat);
+		mat4_to_size(sizo, invmat);
 		
 		/* disable channels not enabled */
 		if (!(data->flag & CHILDOF_LOCX)) loc[0]= loco[0]= 0.0f;
@@ -1017,7 +1017,7 @@
 		float tmat[4][4];
 		
 		/* Get size property, since ob->size is only the object's own relative size, not its global one */
-		mat4_to_size( size,cob->matrix);
+		mat4_to_size(size, cob->matrix);
 		
 		/* Clear the object's rotation */ 	
 		cob->matrix[0][0]=size[0];
@@ -1385,9 +1385,9 @@
 	float size[3];
 	
 	VECCOPY(loc, cob->matrix[3]);
-	mat4_to_size( size,cob->matrix);
+	mat4_to_size(size, cob->matrix);
 	
-	mat4_to_eulO( eul, cob->rotOrder,cob->matrix);
+	mat4_to_eulO(eul, cob->rotOrder, cob->matrix);
 	
 	/* constraint data uses radians internally */
 	
@@ -1638,11 +1638,11 @@
 		float	size[3];
 		
 		VECCOPY(loc, cob->matrix[3]);
-		mat4_to_size( size,cob->matrix);
+		mat4_to_size(size, cob->matrix);
 		
 		/* to allow compatible rotations, must get both rotations in the order of the owner... */
-		mat4_to_eulO( eul, cob->rotOrder,ct->matrix);
-		mat4_to_eulO( obeul, cob->rotOrder,cob->matrix);
+		mat4_to_eulO(eul, cob->rotOrder, ct->matrix);
+		mat4_to_eulO(obeul, cob->rotOrder, cob->matrix);
 		
 		if ((data->flag & ROTLIKE_X)==0)
 			eul[0] = obeul[0];
@@ -1868,29 +1868,29 @@
 {
 	bSameVolumeConstraint *data= con->data;
 
+	float volume = data->volume;
+	float fac = 1.0f;
 	float obsize[3];
-	float volume=data->volume;
 
 	mat4_to_size(obsize, cob->matrix);
-
+	
+	/* calculate normalising scale factor for non-essential values */
+	if (obsize[data->flag] != 0) 
+		fac = sqrt(volume / obsize[data->flag]) / obsize[data->flag];
+	
+	/* apply scaling factor to the channels not being kept */
 	switch (data->flag) {
 		case SAMEVOL_X:
-			if (obsize[0]!=0) {
-				mul_v3_fl(cob->matrix[1], sqrt(volume/obsize[0])/obsize[0]);
-				mul_v3_fl(cob->matrix[2], sqrt(volume/obsize[0])/obsize[0]);
-			}
+			mul_v3_fl(cob->matrix[1], fac);
+			mul_v3_fl(cob->matrix[2], fac);
 			break;
 		case SAMEVOL_Y:
-			if (obsize[1]!=0) {
-				mul_v3_fl(cob->matrix[0], sqrt(volume/obsize[1])/obsize[1]);
-				mul_v3_fl(cob->matrix[2], sqrt(volume/obsize[1])/obsize[1]);
-			}
+			mul_v3_fl(cob->matrix[0], fac);
+			mul_v3_fl(cob->matrix[2], fac);
 			break;
 		case SAMEVOL_Z:
-			if (obsize[2]!=0) {
-				mul_v3_fl(cob->matrix[0], sqrt(volume/obsize[2])/obsize[2]);
-				mul_v3_fl(cob->matrix[1], sqrt(volume/obsize[2])/obsize[2]);
-			}
+			mul_v3_fl(cob->matrix[0], fac);
+			mul_v3_fl(cob->matrix[1], fac);
 			break;
 	}
 }
@@ -2770,7 +2770,7 @@
 		float dist;
 		
 		/* store scaling before destroying obmat */
-		mat4_to_size( size,cob->matrix);
+		mat4_to_size(size, cob->matrix);
 		
 		/* store X orientation before destroying obmat */
 		xx[0] = cob->matrix[0][0];
@@ -3353,7 +3353,7 @@
 				mat4_to_size( dvec,ct->matrix);
 				break;
 			case 1: /* rotation (convert to degrees first) */
-				mat4_to_eulO( dvec, cob->rotOrder,ct->matrix);
+				mat4_to_eulO(dvec, cob->rotOrder, ct->matrix);
 				for (i=0; i<3; i++)
 					dvec[i] = (float)(dvec[i] / M_PI * 180);
 				break;
@@ -3364,8 +3364,8 @@
 		
 		/* extract components of owner's matrix */
 		VECCOPY(loc, cob->matrix[3]);
-		mat4_to_eulO( eul, cob->rotOrder,cob->matrix);
-		mat4_to_size( size,cob->matrix);	
+		mat4_to_eulO(eul, cob->rotOrder, cob->matrix);
+		mat4_to_size(size, cob->matrix);	
 		
 		/* determine where in range current transforms lie */
 		if (data->expo) {
@@ -3485,73 +3485,73 @@
 		float co[3] = {0.0f, 0.0f, 0.0f};
 		float no[3] = {0.0f, 0.0f, 0.0f};
 		float dist;
-
+		
 		SpaceTransform transform;
 		DerivedMesh *target = object_get_derived_final(cob->scene, ct->tar, CD_MASK_BAREMESH);
 		BVHTreeRayHit hit;
 		BVHTreeNearest nearest;
-
+		
 		BVHTreeFromMesh treeData;
-		memset( &treeData, 0, sizeof(treeData) );
-
+		memset(&treeData, 0, sizeof(treeData));
+		
 		nearest.index = -1;
 		nearest.dist = FLT_MAX;
-
+		
 		hit.index = -1;
 		hit.dist = 100000.0f;  //TODO should use FLT_MAX.. but normal projection doenst yet supports it
-
+		

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list