[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24331] branches/sculpt25: Sculpt: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24257 :24330
Brecht Van Lommel
brecht at blender.org
Wed Nov 4 22:21:31 CET 2009
Revision: 24331
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24331
Author: blendix
Date: 2009-11-04 22:21:30 +0100 (Wed, 04 Nov 2009)
Log Message:
-----------
Sculpt: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24257:24330
Modified Paths:
--------------
branches/sculpt25/CMakeLists.txt
branches/sculpt25/SConstruct
branches/sculpt25/config/win64-vc-config.py
branches/sculpt25/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/sculpt25/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/sculpt25/intern/moto/include/MT_assert.h
branches/sculpt25/release/scripts/io/export_3ds.py
branches/sculpt25/release/scripts/io/export_fbx.py
branches/sculpt25/release/scripts/io/export_mdd.py
branches/sculpt25/release/scripts/io/export_obj.py
branches/sculpt25/release/scripts/io/export_ply.py
branches/sculpt25/release/scripts/io/export_x3d.py
branches/sculpt25/release/scripts/io/netrender/client.py
branches/sculpt25/release/scripts/modules/bpy_ops.py
branches/sculpt25/release/scripts/templates/operator.py
branches/sculpt25/release/scripts/ui/properties_data_armature.py
branches/sculpt25/release/scripts/ui/properties_data_bone.py
branches/sculpt25/release/scripts/ui/properties_data_camera.py
branches/sculpt25/release/scripts/ui/properties_data_curve.py
branches/sculpt25/release/scripts/ui/properties_data_empty.py
branches/sculpt25/release/scripts/ui/properties_data_lamp.py
branches/sculpt25/release/scripts/ui/properties_data_lattice.py
branches/sculpt25/release/scripts/ui/properties_data_mesh.py
branches/sculpt25/release/scripts/ui/properties_data_metaball.py
branches/sculpt25/release/scripts/ui/properties_data_modifier.py
branches/sculpt25/release/scripts/ui/properties_data_text.py
branches/sculpt25/release/scripts/ui/properties_game.py
branches/sculpt25/release/scripts/ui/properties_material.py
branches/sculpt25/release/scripts/ui/properties_object.py
branches/sculpt25/release/scripts/ui/properties_object_constraint.py
branches/sculpt25/release/scripts/ui/properties_particle.py
branches/sculpt25/release/scripts/ui/properties_physics_cloth.py
branches/sculpt25/release/scripts/ui/properties_physics_common.py
branches/sculpt25/release/scripts/ui/properties_physics_field.py
branches/sculpt25/release/scripts/ui/properties_physics_fluid.py
branches/sculpt25/release/scripts/ui/properties_physics_smoke.py
branches/sculpt25/release/scripts/ui/properties_physics_softbody.py
branches/sculpt25/release/scripts/ui/properties_render.py
branches/sculpt25/release/scripts/ui/properties_scene.py
branches/sculpt25/release/scripts/ui/properties_texture.py
branches/sculpt25/release/scripts/ui/properties_world.py
branches/sculpt25/release/scripts/ui/space_buttons.py
branches/sculpt25/release/scripts/ui/space_console.py
branches/sculpt25/release/scripts/ui/space_filebrowser.py
branches/sculpt25/release/scripts/ui/space_image.py
branches/sculpt25/release/scripts/ui/space_info.py
branches/sculpt25/release/scripts/ui/space_logic.py
branches/sculpt25/release/scripts/ui/space_node.py
branches/sculpt25/release/scripts/ui/space_outliner.py
branches/sculpt25/release/scripts/ui/space_sequencer.py
branches/sculpt25/release/scripts/ui/space_text.py
branches/sculpt25/release/scripts/ui/space_time.py
branches/sculpt25/release/scripts/ui/space_userpref.py
branches/sculpt25/release/scripts/ui/space_view3d.py
branches/sculpt25/release/scripts/ui/space_view3d_toolbar.py
branches/sculpt25/source/blender/blenkernel/BKE_deform.h
branches/sculpt25/source/blender/blenkernel/intern/armature.c
branches/sculpt25/source/blender/blenkernel/intern/blender.c
branches/sculpt25/source/blender/blenkernel/intern/curve.c
branches/sculpt25/source/blender/blenkernel/intern/deform.c
branches/sculpt25/source/blender/blenkernel/intern/modifier.c
branches/sculpt25/source/blender/blenkernel/intern/softbody.c
branches/sculpt25/source/blender/blenkernel/intern/texture.c
branches/sculpt25/source/blender/blenloader/intern/readfile.c
branches/sculpt25/source/blender/collada/DocumentExporter.cpp
branches/sculpt25/source/blender/collada/DocumentImporter.cpp
branches/sculpt25/source/blender/editors/animation/drivers.c
branches/sculpt25/source/blender/editors/animation/keyframing.c
branches/sculpt25/source/blender/editors/include/ED_mesh.h
branches/sculpt25/source/blender/editors/mesh/mesh_data.c
branches/sculpt25/source/blender/editors/mesh/mesh_ops.c
branches/sculpt25/source/blender/editors/object/object_add.c
branches/sculpt25/source/blender/editors/object/object_edit.c
branches/sculpt25/source/blender/editors/object/object_intern.h
branches/sculpt25/source/blender/editors/object/object_ops.c
branches/sculpt25/source/blender/editors/object/object_relations.c
branches/sculpt25/source/blender/editors/object/object_shapekey.c
branches/sculpt25/source/blender/editors/screen/area.c
branches/sculpt25/source/blender/editors/screen/screen_edit.c
branches/sculpt25/source/blender/editors/transform/transform.c
branches/sculpt25/source/blender/editors/transform/transform_constraints.c
branches/sculpt25/source/blender/editors/transform/transform_manipulator.c
branches/sculpt25/source/blender/editors/uvedit/uvedit_intern.h
branches/sculpt25/source/blender/editors/uvedit/uvedit_ops.c
branches/sculpt25/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/sculpt25/source/blender/makesdna/DNA_particle_types.h
branches/sculpt25/source/blender/makesdna/DNA_texture_types.h
branches/sculpt25/source/blender/makesrna/RNA_access.h
branches/sculpt25/source/blender/makesrna/RNA_define.h
branches/sculpt25/source/blender/makesrna/RNA_enum_types.h
branches/sculpt25/source/blender/makesrna/intern/makesrna.c
branches/sculpt25/source/blender/makesrna/intern/rna_ID.c
branches/sculpt25/source/blender/makesrna/intern/rna_access.c
branches/sculpt25/source/blender/makesrna/intern/rna_boid.c
branches/sculpt25/source/blender/makesrna/intern/rna_cloth.c
branches/sculpt25/source/blender/makesrna/intern/rna_define.c
branches/sculpt25/source/blender/makesrna/intern/rna_fluidsim.c
branches/sculpt25/source/blender/makesrna/intern/rna_internal_types.h
branches/sculpt25/source/blender/makesrna/intern/rna_mesh.c
branches/sculpt25/source/blender/makesrna/intern/rna_object.c
branches/sculpt25/source/blender/makesrna/intern/rna_object_force.c
branches/sculpt25/source/blender/makesrna/intern/rna_particle.c
branches/sculpt25/source/blender/makesrna/intern/rna_scene.c
branches/sculpt25/source/blender/makesrna/intern/rna_smoke.c
branches/sculpt25/source/blender/makesrna/intern/rna_texture.c
branches/sculpt25/source/blender/python/epy_doc_gen.py
branches/sculpt25/source/blender/python/intern/bpy_interface.c
branches/sculpt25/source/blender/python/intern/bpy_rna.c
branches/sculpt25/source/blender/render/intern/source/pointdensity.c
branches/sculpt25/source/blender/windowmanager/intern/wm_operators.c
Added Paths:
-----------
branches/sculpt25/release/scripts/io/import_anim_bvh.py
branches/sculpt25/release/scripts/io/import_scene_3ds.py
branches/sculpt25/release/scripts/io/import_scene_obj.py
branches/sculpt25/release/scripts/modules/bpy_utils.py
branches/sculpt25/release/scripts/op/
branches/sculpt25/release/scripts/op/add_mesh_torus.py
branches/sculpt25/release/scripts/op/mesh_skin.py
branches/sculpt25/release/scripts/op/uvcalc_smart_project.py
branches/sculpt25/release/scripts/op/vertexpaint_dirt.py
branches/sculpt25/release/scripts/op/wm.py
Removed Paths:
-------------
branches/sculpt25/release/scripts/io/add_mesh_torus.py
branches/sculpt25/release/scripts/io/import_3ds.py
branches/sculpt25/release/scripts/io/import_obj.py
branches/sculpt25/release/scripts/io/mesh_skin.py
branches/sculpt25/release/scripts/io/vertexpaint_dirt.py
branches/sculpt25/release/scripts/modules/bpy_sys.py
branches/sculpt25/release/scripts/op/add_mesh_torus.py
branches/sculpt25/release/scripts/op/mesh_skin.py
branches/sculpt25/release/scripts/op/uvcalc_smart_project.py
branches/sculpt25/release/scripts/op/vertexpaint_dirt.py
branches/sculpt25/release/scripts/op/wm.py
Modified: branches/sculpt25/CMakeLists.txt
===================================================================
--- branches/sculpt25/CMakeLists.txt 2009-11-04 21:10:28 UTC (rev 24330)
+++ branches/sculpt25/CMakeLists.txt 2009-11-04 21:21:30 UTC (rev 24331)
@@ -518,9 +518,9 @@
ENDIF (WITH_COCOA)
IF(WITH_OPENMP)
- SET(LLIBS "${LLIBS} -lgomp ")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+ SET(LLIBS "${LLIBS} -lgomp")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
ENDIF(WITH_OPENMP)
IF (WITH_OPENCOLLADA)
@@ -555,6 +555,16 @@
SET(TIFF_INC ${TIFF}/include)
SET(EXETYPE MACOSX_BUNDLE)
+
+
+ IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
+ SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
+ SET(CMAKE_C_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
+ ELSEIF(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+ SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
+ SET(CMAKE_C_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
+ ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
+
ENDIF(APPLE)
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
Modified: branches/sculpt25/SConstruct
===================================================================
--- branches/sculpt25/SConstruct 2009-11-04 21:10:28 UTC (rev 24330)
+++ branches/sculpt25/SConstruct 2009-11-04 21:21:30 UTC (rev 24331)
@@ -124,7 +124,10 @@
#if env:
# btools.SetupSpawn(env)
else:
- env = BlenderEnvironment(ENV = os.environ)
+ if bitness==64 and platform=='win32':
+ env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+ else:
+ env = BlenderEnvironment(ENV = os.environ)
if not env:
print "Could not create a build environment"
Modified: branches/sculpt25/config/win64-vc-config.py
===================================================================
--- branches/sculpt25/config/win64-vc-config.py 2009-11-04 21:10:28 UTC (rev 24330)
+++ branches/sculpt25/config/win64-vc-config.py 2009-11-04 21:21:30 UTC (rev 24331)
@@ -158,7 +158,7 @@
BF_OPENCOLLADA = LIBDIR + '/opencollada'
BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'opencollada'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
WITH_BF_STATICOPENGL = False
Modified: branches/sculpt25/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/sculpt25/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-11-04 21:10:28 UTC (rev 24330)
+++ branches/sculpt25/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-11-04 21:21:30 UTC (rev 24331)
@@ -786,7 +786,7 @@
case NSFlagsChanged:
handleKeyEvent(event);
- /* Support system-wide keyboard shortcuts, like Exposé, ...) =>included in always NSApp sendEvent */
+ /* Support system-wide keyboard shortcuts, like Exposé, ...) =>included in always NSApp sendEvent */
/* if (([event modifierFlags] & NSCommandKeyMask) || [event type] == NSFlagsChanged) {
[NSApp sendEvent:event];
}*/
@@ -891,8 +891,8 @@
//Check open windows if some changes are not saved
if (m_windowManager->getAnyModifiedState())
{
- int shouldQuit = NSRunAlertPanel(@"Exit Blender", @"Some changes have not been saved. Do you really want to quit ?",
- @"Cancel", @"Quit anyway", nil);
+ int shouldQuit = NSRunAlertPanel(@"Exit Blender", @"Some changes have not been saved.\nDo you really want to quit ?",
+ @"Cancel", @"Quit Anyway", nil);
if (shouldQuit == NSAlertAlternateReturn)
{
pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventQuit, NULL) );
Modified: branches/sculpt25/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/sculpt25/intern/ghost/intern/GHOST_WindowCocoa.mm 2009-11-04 21:10:28 UTC (rev 24330)
+++ branches/sculpt25/intern/ghost/intern/GHOST_WindowCocoa.mm 2009-11-04 21:21:30 UTC (rev 24331)
@@ -68,7 +68,7 @@
- (void)windowWillClose:(NSNotification *)notification;
- (void)windowDidBecomeKey:(NSNotification *)notification;
- (void)windowDidResignKey:(NSNotification *)notification;
-- (void)windowDidUpdate:(NSNotification *)notification;
+- (void)windowDidExpose:(NSNotification *)notification;
- (void)windowDidResize:(NSNotification *)notification;
@end
@@ -91,13 +91,10 @@
- (void)windowDidResignKey:(NSNotification *)notification
{
- //The window is no more key when its own view becomes fullscreen
- //but ghost doesn't know the view/window difference, so hide this fact
- if (associatedWindow->getState() != GHOST_kWindowStateFullScreen)
- systemCocoa->handleWindowEvent(GHOST_kEventWindowDeactivate, associatedWindow);
+ systemCocoa->handleWindowEvent(GHOST_kEventWindowDeactivate, associatedWindow);
}
-- (void)windowDidUpdate:(NSNotification *)notification
+- (void)windowDidExpose:(NSNotification *)notification
{
systemCocoa->handleWindowEvent(GHOST_kEventWindowUpdate, associatedWindow);
}
@@ -622,6 +619,7 @@
//Make window normal and resize it
[m_window setStyleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)];
[m_window setFrame:[[m_window screen] visibleFrame] display:YES];
+ //TODO for 10.6 only : window title is forgotten after the style change
[m_window makeFirstResponder:m_openGLView];
#else
//With 10.5, we need to create a new window to change its style to borderless
Modified: branches/sculpt25/intern/moto/include/MT_assert.h
===================================================================
--- branches/sculpt25/intern/moto/include/MT_assert.h 2009-11-04 21:10:28 UTC (rev 24330)
+++ branches/sculpt25/intern/moto/include/MT_assert.h 2009-11-04 21:21:30 UTC (rev 24331)
@@ -76,7 +76,7 @@
#endif /* breakpoint */
-#if defined(WIN32) && !defined(__GNUC__)
+#if defined(_WIN32) && !defined(__GNUC__)
#define MT_assert(predicate) assert(predicate)
#else
Deleted: branches/sculpt25/release/scripts/io/add_mesh_torus.py
===================================================================
--- branches/sculpt25/release/scripts/io/add_mesh_torus.py 2009-11-04 21:10:28 UTC (rev 24330)
+++ branches/sculpt25/release/scripts/io/add_mesh_torus.py 2009-11-04 21:21:30 UTC (rev 24331)
@@ -1,139 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8-80 compliant>
-import bpy
-import Mathutils
-from math import cos, sin, pi
-
-
-def add_torus(major_rad, minor_rad, major_seg, minor_seg):
- Vector = Mathutils.Vector
- Quaternion = Mathutils.Quaternion
-
- PI_2 = pi * 2
- z_axis = (0, 0, 1)
-
- verts = []
- faces = []
- i1 = 0
- tot_verts = major_seg * minor_seg
- for major_index in range(major_seg):
- quat = Quaternion(z_axis, (major_index / major_seg) * PI_2)
-
- for minor_index in range(minor_seg):
- angle = 2 * pi * minor_index / minor_seg
-
- vec = Vector(major_rad + (cos(angle) * minor_rad), 0.0,
- (sin(angle) * minor_rad)) * quat
-
- verts.extend([vec.x, vec.y, vec.z])
-
- if minor_index + 1 == minor_seg:
- i2 = (major_index) * minor_seg
- i3 = i1 + minor_seg
- i4 = i2 + minor_seg
-
- else:
- i2 = i1 + 1
- i3 = i1 + minor_seg
- i4 = i3 + 1
-
- if i2 >= tot_verts:
- i2 = i2 - tot_verts
- if i3 >= tot_verts:
- i3 = i3 - tot_verts
- if i4 >= tot_verts:
- i4 = i4 - tot_verts
-
- # stupid eekadoodle
- if i2:
- faces.extend([i1, i3, i4, i2])
- else:
- faces.extend([i2, i1, i3, i4])
-
- i1 += 1
-
- return verts, faces
-
-from bpy.props import *
-
-
-class AddTorusPrimitive(bpy.types.Operator):
- '''Add a torus mesh.'''
- bl_idname = "mesh.primitive_torus_add"
- bl_label = "Add Torus"
- bl_register = True
- bl_undo = True
-
- major_radius = FloatProperty(name="Major Radius",
- description="Number of segments for the main ring of the torus",
- default=1.0, min=0.01, max=100.0)
- minor_radius = FloatProperty(name="Minor Radius",
- description="Number of segments for the minor ring of the torus",
- default=0.25, min=0.01, max=100.0)
- major_segments = IntProperty(name="Major Segments",
- description="Number of segments for the main ring of the torus",
- default=48, min=3, max=256)
- minor_segments = IntProperty(name="Minor Segments",
- description="Number of segments for the minor ring of the torus",
- default=16, min=3, max=256)
-
- def execute(self, context):
-
- verts_loc, faces = add_torus(self.major_radius,
- self.minor_radius,
- self.major_segments,
- self.minor_segments)
-
- mesh = bpy.data.add_mesh("Torus")
-
- mesh.add_geometry(int(len(verts_loc) / 3), 0, int(len(faces) / 4))
- mesh.verts.foreach_set("co", verts_loc)
- mesh.faces.foreach_set("verts_raw", faces)
-
- scene = context.scene
-
- # ugh
- for ob in scene.objects:
- ob.selected = False
-
- mesh.update()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list