[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39057] branches/bmesh/blender: svn merge -r38971:38972 https://svn.blender.org/svnroot/bf-blender/trunk/ blender, left UVCALC_TRANSFORM_CORRECT as a BMesh TODO

Campbell Barton ideasman42 at gmail.com
Fri Aug 5 10:16:09 CEST 2011


Revision: 39057
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39057
Author:   campbellbarton
Date:     2011-08-05 08:16:09 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
svn merge -r38971:38972 https://svn.blender.org/svnroot/bf-blender/trunk/blender, left UVCALC_TRANSFORM_CORRECT as a BMesh TODO

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38971

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/include/ED_transform.h
    branches/bmesh/blender/source/blender/editors/transform/transform.c
    branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
    branches/bmesh/blender/source/blender/editors/transform/transform_ops.c

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
    branches/bmesh/blender/source/blender/editors/render/render_update.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:31524-38971
   + /trunk/blender:31524-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-38972


Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-38971
   + /trunk/blender/release/scripts/startup/bl_ui/space_node.py:36154-38972

Modified: branches/bmesh/blender/source/blender/editors/include/ED_transform.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/include/ED_transform.h	2011-08-05 08:02:04 UTC (rev 39056)
+++ branches/bmesh/blender/source/blender/editors/include/ED_transform.h	2011-08-05 08:16:09 UTC (rev 39057)
@@ -148,6 +148,7 @@
 #define P_ALIGN_SNAP	(P_GEO_SNAP|(1 << 5))
 #define P_CONSTRAINT	(1 << 6)
 #define P_OPTIONS		(1 << 7)
+#define P_CORRECT_UV 	(1 << 8)
 
 void Transform_Properties(struct wmOperatorType *ot, int flags);
 


Property changes on: branches/bmesh/blender/source/blender/editors/render/render_update.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/source/blender/editors/render/render_update.c:36801-38971
   + /trunk/blender/source/blender/editors/render/render_update.c:36801-38972

Modified: branches/bmesh/blender/source/blender/editors/transform/transform.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/transform/transform.c	2011-08-05 08:02:04 UTC (rev 39056)
+++ branches/bmesh/blender/source/blender/editors/transform/transform.c	2011-08-05 08:16:09 UTC (rev 39057)
@@ -4609,6 +4609,12 @@
 	if (!em)
 		return;
 	
+	/* BMESH_TODO, (t->settings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT)
+	 * currently all vertex data is interpolated which is nice mostly
+	 * except for shape keys where you dont want to modify UVs for eg.
+	 * current BMesh code doesnt make it easy to pick which data we interpolate
+	 * - campbell */
+
 	BLI_smallhash_init(&visit);
 	
 		for (i=0, tempsv=sld->sv; i<sld->totsv; i++, tempsv++) {

Modified: branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/transform/transform_generics.c	2011-08-05 08:02:04 UTC (rev 39056)
+++ branches/bmesh/blender/source/blender/editors/transform/transform_generics.c	2011-08-05 08:16:09 UTC (rev 39057)
@@ -1015,6 +1015,22 @@
 				t->options |= CTX_NO_PET;
 			}
 		}
+
+		/* initialize UV transform from */
+		if (RNA_struct_find_property(op->ptr, "correct_uv")) {
+			if(RNA_property_is_set(op->ptr, "correct_uv")) {
+				if(RNA_boolean_get(op->ptr, "correct_uv")) {
+					t->settings->uvcalc_flag |= UVCALC_TRANSFORM_CORRECT;
+				}
+				else {
+					t->settings->uvcalc_flag &= ~UVCALC_TRANSFORM_CORRECT;
+				}

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list