Revision: 44291
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44291
Author: kjym3
Date: 2012-02-21 02:19:54 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 44288.
Conflicts resolved:
source/blender/blenkernel/intern/cdderivedmesh.c
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44288
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_displist.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_subsurf.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.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/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_scanfill.h
branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/scanfill.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_iterators.h
branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_operator_api.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_iterators_inline.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_create.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/bmesh_select.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/bmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/bmesh_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/knifetool.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/loopcut.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_stats.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_orientations.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/util/crazyspace.c
branches/soc-2008-mxcurioni/source/blender/editors/util/ed_util.c
branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2008-mxcurioni/source/blender/modifiers/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.h
branches/soc-2008-mxcurioni/source/blender/python/intern/gpu.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
Removed Paths:
-------------
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_ngoninterp.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44266
+
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44288
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2012-02-21 01:42:03 UTC (rev
44290)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2012-02-21 02:19:54 UTC (rev
44291)
@@ -254,11 +254,14 @@
"Choose the minimum OSX version required: 10.4 or 10.5"
FORCE)
endif()
- if(${CMAKE_GENERATOR} MATCHES "Xcode" AND (${XCODE_VERSION}
VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4))
- # Xcode 4 defaults to the Apple LLVM Compiler.
- # Override the default compiler selection because Blender only
compiles with gcc
- set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION
"com.apple.compilers.llvmgcc42")
- message(STATUS "Setting compiler to: "
${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
+ MESSAGE(STATUS ${CMAKE_GENERATOR})
+ if(${CMAKE_GENERATOR} MATCHES "Xcode")
+ if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION}
VERSION_GREATER 4)
+ # Xcode 4 defaults to the Apple LLVM Compiler.
+ # Override the default compiler selection because
Blender only compiles with gcc
+ set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION
"com.apple.compilers.llvmgcc42")
+ message(STATUS "Setting compiler to: "
${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
+ endif()
endif()
option(WITH_COCOA "Use Cocoa framework instead of deprecated
Carbon" ON)
option(USE_QTKIT "Use QtKit instead of Carbon quicktime
(needed for having partial quicktime for 64bit)" OFF)
Modified: branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
2012-02-21 01:42:03 UTC (rev 44290)
+++ branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
2012-02-21 02:19:54 UTC (rev 44291)
@@ -165,7 +165,7 @@
return;
}
- ciErr = clGetPlatformIDs(num_platforms, &cpPlatform, NULL);
+ ciErr = clGetPlatformIDs(1, &cpPlatform, NULL);
if(opencl_error(ciErr))
return;
@@ -709,7 +709,7 @@
if(clGetPlatformIDs(0, NULL, &num_platforms) != CL_SUCCESS ||
num_platforms == 0)
return;
- if(clGetPlatformIDs(num_platforms, &platform_id, NULL) != CL_SUCCESS)
+ if(clGetPlatformIDs(1, &platform_id, NULL) != CL_SUCCESS)
return;
if(clGetDeviceIDs(platform_id,
CL_DEVICE_TYPE_GPU|CL_DEVICE_TYPE_ACCELERATOR, 0, NULL, &num_devices) !=
CL_SUCCESS)
Modified:
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
---
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/mesh_utils.py
2012-02-21 01:42:03 UTC (rev 44290)
+++
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/mesh_utils.py
2012-02-21 02:19:54 UTC (rev 44291)
@@ -140,8 +140,7 @@
edges = {}
for f in faces:
-# if len(f) == 4:
- if f.vertices_raw[3] != 0:
+ if len(f.vertices) == 4:
edge_keys = f.edge_keys
for i, edkey in enumerate(f.edge_keys):
edges.setdefault(edkey, []).append(edge_keys[OTHER_INDEX[i]])
Modified:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
---
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
2012-02-21 01:42:03 UTC (rev 44290)
+++
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
2012-02-21 02:19:54 UTC (rev 44291)
@@ -46,11 +46,7 @@
# the mt.type enum is (ab)used for a lookup on function names
# ...to avoid lengthy if statements
# so each type must have a function here.
-
- def NGONINTERP(self, layout, ob, md):
- split = layout.split()
- split.prop(md, "resolution")
-
+
def ARMATURE(self, layout, ob, md):
split = layout.split()
Property changes on:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:35829-39896,40098-42166,42903-43038,43220-43585,43749-43881,44223-44266
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:35829-39896,40098-42166,42903-43038,43220-43585,43749-43881,44223-44288
Modified:
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
2012-02-21 01:42:03 UTC (rev 44290)
+++ branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
2012-02-21 02:19:54 UTC (rev 44291)
@@ -899,6 +899,7 @@
sub1.prop(inputs, "use_mouse_emulate_3_button")
sub.prop(inputs, "use_mouse_continuous")
sub.prop(inputs, "drag_threshold")
+ sub.prop(inputs, "tweak_threshold")
sub.label(text="Select With:")
sub.row().prop(inputs, "select_mouse", expand=True)
@@ -936,8 +937,6 @@
sub.label(text="NDOF Device:")
sub.prop(inputs, "ndof_sensitivity", text="NDOF Sensitivity")
- col.prop(inputs, "tweak_threshold")
-
row.separator()
def draw(self, context):
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmesh.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmesh.h
2012-02-21 01:42:03 UTC (rev 44290)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmesh.h
2012-02-21 02:19:54 UTC (rev 44291)
@@ -41,7 +41,6 @@
#include "BLI_mempool.h"
#include "BLI_memarena.h"
#include "DNA_image_types.h"
-#include "BLI_editVert.h"
#include "BKE_DerivedMesh.h"
//XXX #include "transform.h"
#include "bmesh.h"
@@ -250,9 +249,4 @@
float *BME_bevel_calc_polynormal(struct BME_Poly *f, struct BME_TransData_Head
*td);
struct BMesh *BME_bevel(struct BMEditMesh *em, float value, int res, int
options, int defgrp_index, float angle, BME_TransData_Head **rtd);
-/*CONVERSION FUNCTIONS*/
-struct BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em);
-void BME_bmesh_to_editmesh(struct BME_Mesh *bm, BME_TransData_Head *td,
EditMesh *em);
-struct BME_Mesh *BME_derivedmesh_to_bmesh(struct DerivedMesh *dm);
-struct DerivedMesh *BME_bmesh_to_derivedmesh(struct BME_Mesh *bm, struct
DerivedMesh *dm);
#endif
Modified:
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cdderivedmesh.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cdderivedmesh.h
2012-02-21 01:42:03 UTC (rev 44290)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cdderivedmesh.h
2012-02-21 02:19:54 UTC (rev 44291)
@@ -39,7 +39,6 @@
struct DerivedMesh;
struct BMEditMesh;
-struct EditMesh;
struct Mesh;
struct Object;
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
2012-02-21 01:42:03 UTC (rev 44290)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
2012-02-21 02:19:54 UTC (rev 44291)
@@ -39,7 +39,6 @@
struct ARegion;
struct bScreen;
-struct EditMesh;
struct ListBase;
struct Main;
struct Object;
Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
2012-02-21 01:42:03 UTC (rev 44290)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
2012-02-21 02:19:54 UTC (rev 44291)
@@ -178,13 +178,9 @@
struct CustomData *dest, int
source_index,
int dest_index, int count);
void CustomData_copy_elements(int type, void *source, void *dest, int count);
-void CustomData_em_copy_data(const struct CustomData *source,
- struct CustomData
*dest, void *src_block,
- void **dest_block);
void CustomData_bmesh_copy_data(const struct CustomData *source,
struct CustomData *dest, void *src_block,
void **dest_block);
-void CustomData_em_validate_data(struct CustomData *data, void *block, int
sub_elements);
/* frees data in a CustomData object
* return 1 on success, 0 on failure
@@ -208,9 +204,6 @@
void CustomData_interp(const struct CustomData *source, struct CustomData
*dest,
int *src_indices, float *weights,
float *sub_weights,
int count, int dest_index);
-void CustomData_em_interp(struct CustomData *data, void **src_blocks,
- float *weights, float
*sub_weights, int count,
- void *dest_block);
void CustomData_bmesh_interp(struct CustomData *data, void **src_blocks,
float *weights, float
*sub_weights, int count,
void *dest_block);
@@ -226,8 +219,6 @@
*/
void *CustomData_get(const struct CustomData *data, int index, int type);
void *CustomData_get_n(const struct CustomData *data, int type, int index, int
n);
-void *CustomData_em_get(const struct CustomData *data, void *block, int type);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
