Revision: 38310
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38310
Author: psy-fi
Date: 2011-07-11 16:58:16 +0000 (Mon, 11 Jul 2011)
Log Message:
-----------
sliced an onion into the salad -sniff- -r38307
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38307
Modified Paths:
--------------
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-salad/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-salad/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2011-salad/source/blender/blenlib/BLI_pbvh.h
branches/soc-2011-salad/source/blender/blenlib/intern/math_matrix.c
branches/soc-2011-salad/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
branches/soc-2011-salad/source/blender/collada/DocumentExporter.cpp
branches/soc-2011-salad/source/blender/editors/include/ED_image.h
branches/soc-2011-salad/source/blender/editors/include/ED_mesh.h
branches/soc-2011-salad/source/blender/editors/include/ED_sculpt.h
branches/soc-2011-salad/source/blender/editors/include/ED_uvedit.h
branches/soc-2011-salad/source/blender/editors/include/ED_view3d.h
branches/soc-2011-salad/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-salad/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-salad/source/blender/editors/space_file/file_draw.c
branches/soc-2011-salad/source/blender/editors/space_file/filesel.c
branches/soc-2011-salad/source/blender/editors/space_image/space_image.c
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-salad/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2011-salad/source/blender/editors/uvedit/uvedit_intern.h
branches/soc-2011-salad/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-salad/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-salad/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-salad/source/blender/python/intern/bpy_app.c
branches/soc-2011-salad/source/blender/windowmanager/WM_api.h
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-salad/source/blenderplayer/bad_level_call_stubs/stubs.c
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37529
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38239
/trunk/blender:36834-38308
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38239
/trunk/blender:36834-38308
Modified: branches/soc-2011-salad/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/space_image.py
2011-07-11 16:26:29 UTC (rev 38309)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/space_image.py
2011-07-11 16:58:16 UTC (rev 38310)
@@ -253,6 +253,7 @@
layout.separator()
layout.prop(uv, "use_live_unwrap")
+ layout.prop(uv, "use_island_manager")
layout.operator("uv.unwrap")
layout.operator("uv.pin", text="Unpin").clear = True
layout.operator("uv.pin")
Modified:
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
---
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-07-11 16:26:29 UTC (rev 38309)
+++
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-07-11 16:58:16 UTC (rev 38310)
@@ -1119,7 +1119,7 @@
def draw(self, context):
layout = self.layout
-
+ ipaint = context.tool_settings.image_paint
ob = context.active_object
col = layout.column()
@@ -1129,6 +1129,10 @@
col.operator("object.vertex_group_invert", text="Invert")
col.operator("object.vertex_group_clean", text="Clean")
col.operator("object.vertex_group_levels", text="Levels")
+ col.operator("paint.weight_layers_image_from_view", text="Save Weight
Images")
+ #lazy stuff, but maybe not so, export size should be unified. Maybe add
better description to rna?
+ row = col.row(align=True)
+ row.prop(ipaint, "screen_grab_size", text="")
class VIEW3D_PT_tools_weightpaint_options(View3DPanel, bpy.types.Panel):
Modified: branches/soc-2011-salad/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/BKE_blender.h
2011-07-11 16:26:29 UTC (rev 38309)
+++ branches/soc-2011-salad/source/blender/blenkernel/BKE_blender.h
2011-07-11 16:58:16 UTC (rev 38310)
@@ -44,7 +44,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 258
-#define BLENDER_SUBVERSION 1
+#define BLENDER_SUBVERSION 3 // temporary bump for testing
purposes in Onion branch
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: branches/soc-2011-salad/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/BKE_mesh.h
2011-07-11 16:26:29 UTC (rev 38309)
+++ branches/soc-2011-salad/source/blender/blenkernel/BKE_mesh.h
2011-07-11 16:58:16 UTC (rev 38310)
@@ -122,6 +122,18 @@
unsigned char tfindex, separate, flag;
} UvMapVert;
+typedef struct UvVertMap2 {
+ struct UvElement **vert;
+ struct UvElement *buf;
+ int numOfUVs;
+} UvVertMap2;
+
+typedef struct UvElement {
+ struct UvElement *next;
+ struct EditFace *face;
+ unsigned char tfindex, separate, flag;
+} UvElement;
+
UvVertMap *make_uv_vert_map(struct MFace *mface, struct MTFace *tface,
unsigned int totface, unsigned int totvert, int selected, float *limit);
UvMapVert *get_uv_map_vert(UvVertMap *vmap, unsigned int v);
void free_uv_vert_map(UvVertMap *vmap);
Modified: branches/soc-2011-salad/source/blender/blenlib/BLI_math_matrix.h
===================================================================
--- branches/soc-2011-salad/source/blender/blenlib/BLI_math_matrix.h
2011-07-11 16:26:29 UTC (rev 38309)
+++ branches/soc-2011-salad/source/blender/blenlib/BLI_math_matrix.h
2011-07-11 16:58:16 UTC (rev 38310)
@@ -54,7 +54,7 @@
void unit_m4(float R[4][4]);
void copy_m3_m3(float R[3][3], float A[3][3]);
-void copy_m4_m4(float R[4][4], float A[4][4]);
+void copy_m4_m4(float R[4][4], const float A[4][4]);
void copy_m3_m4(float R[3][3], float A[4][4]);
void copy_m4_m3(float R[4][4], float A[3][3]);
@@ -67,7 +67,7 @@
void add_m4_m4m4(float R[4][4], float A[4][4], float B[4][4]);
void mul_m3_m3m3(float R[3][3], float A[3][3], float B[3][3]);
-void mul_m4_m4m4(float R[4][4], float A[4][4], float B[4][4]);
+void mul_m4_m4m4(float R[4][4], const float A[4][4], const float B[4][4]);
void mul_m4_m3m4(float R[4][4], float A[3][3], float B[4][4]);
void mul_m4_m4m3(float R[4][4], float A[4][4], float B[3][3]);
void mul_m3_m3m4(float R[3][3], float A[3][3], float B[4][4]);
@@ -80,10 +80,10 @@
float M5[4][4], float M6[4][4], float M7[4][4], float M8[4][4]);
void mul_m4_v3(float M[4][4], float r[3]);
-void mul_v3_m4v3(float r[3], float M[4][4], float v[3]);
+void mul_v3_m4v3(float r[3], const float M[4][4], const float v[3]);
void mul_mat3_m4_v3(float M[4][4], float r[3]);
-void mul_m4_v4(float M[4][4], float r[4]);
-void mul_v4_m4v4(float r[4], float M[4][4], float v[4]);
+void mul_m4_v4(const float M[4][4], float r[4]);
+void mul_v4_m4v4(float r[4], const float M[4][4], float v[4]);
void mul_project_m4_v3(float M[4][4], float vec[3]);
void mul_m3_v3(float M[3][3], float r[3]);
@@ -98,7 +98,7 @@
int invert_m3(float R[3][3]);
int invert_m3_m3(float R[3][3], float A[3][3]);
int invert_m4(float R[4][4]);
-int invert_m4_m4(float R[4][4], float A[4][4]);
+int invert_m4_m4(float R[4][4], const float A[4][4]);
/****************************** Linear Algebra *******************************/
Modified: branches/soc-2011-salad/source/blender/blenlib/BLI_pbvh.h
===================================================================
--- branches/soc-2011-salad/source/blender/blenlib/BLI_pbvh.h 2011-07-11
16:26:29 UTC (rev 38309)
+++ branches/soc-2011-salad/source/blender/blenlib/BLI_pbvh.h 2011-07-11
16:58:16 UTC (rev 38310)
@@ -58,7 +58,7 @@
struct PBVHHiddenArea *next, *prev;
float clip_planes[4][4];
int hide_inside;
-} HiddenArea;
+} PBVHHiddenArea;
/* Callbacks */
@@ -69,10 +69,10 @@
typedef void (*BLI_pbvh_HitOccludedCallback)(PBVHNode *node, void *data,
float* tmin);
/* test AABB against sphere */
-typedef struct {
- float *center;
+typedef struct PBVHSearchSphereData {
+ const float *center;
float radius_squared;
- int original;
+ int use_orig_bb;
} PBVHSearchSphereData;
int BLI_pbvh_search_sphere_cb(PBVHNode *node, void *data);
@@ -81,12 +81,12 @@
PBVH *BLI_pbvh_new(void);
void BLI_pbvh_build_mesh(PBVH *bvh, struct MFace *faces, struct MVert *verts,
struct CustomData *vdata, struct CustomData *fdata,
- int totface, int totvert, ListBase *hidden_areas);
+ int totface, int totvert, struct ListBase
*hidden_areas);
void BLI_pbvh_build_grids(PBVH *bvh, struct DMGridData **grids,
struct DMGridAdjacency *gridadj, int totgrid,
int gridsize, struct GridKey *gridkey, void
**gridfaces,
struct CustomData *vdata, struct CustomData *fdata,
- ListBase *hidden_areas);
+ struct ListBase *hidden_areas);
void BLI_pbvh_free(PBVH *bvh);
/* Hierarchical Search in the BVH, two methods:
@@ -107,7 +107,7 @@
hit first */
void BLI_pbvh_raycast(PBVH *bvh, BLI_pbvh_HitOccludedCallback cb, void *data,
- float ray_start[3], float ray_normal[3], int
original);
+ float ray_start[3], float ray_normal[3], int
use_orig_bb);
int BLI_pbvh_node_raycast(PBVH *bvh, PBVHNode *node, float (*origco)[3],
float ray_start[3], float ray_normal[3], float *dist,
int *hit_index, int *grid_hit_index);
@@ -329,7 +329,7 @@
void BLI_pbvh_gather_proxies(PBVH* pbvh, PBVHNode*** nodes, int* totnode);
void BLI_pbvh_draw_nodes_in_sphere(PBVH *bvh, float center[3], float radius,
int flags);
-void BLI_pbvh_gather_nodes_in_sphere(PBVH *bvh, float center[3], float radius,
PBVHNode ***nodes, int *totnode);
+void BLI_pbvh_gather_nodes_in_sphere(PBVH *bvh, const float center[3], float
radius, PBVHNode ***nodes, int *totnode);
void BLI_pbvh_node_array_draw(PBVH *bvh, PBVHNode **nodes, int totnode, int
flags);
//void BLI_pbvh_node_BB_reset(PBVHNode* node);
Modified: branches/soc-2011-salad/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenlib/intern/math_matrix.c
2011-07-11 16:26:29 UTC (rev 38309)
+++ branches/soc-2011-salad/source/blender/blenlib/intern/math_matrix.c
2011-07-11 16:58:16 UTC (rev 38310)
@@ -68,7 +68,7 @@
memcpy(&m1[0], &m2[0], 9*sizeof(float));
}
-void copy_m4_m4(float m1[][4], float m2[][4])
+void copy_m4_m4(float m1[][4], const float m2[][4])
{
memcpy(m1, m2, 4*4*sizeof(float));
}
@@ -144,14 +144,22 @@
/******************************** Arithmetic *********************************/
-void mul_m4_m4m4(float m1[][4], float m2_[][4], float m3_[][4])
+void mul_m4_m4m4(float m1[][4], const float m2[][4], const float m3[][4])
{
- float m2[4][4], m3[4][4];
+ float t2[4][4], t3[4][4];
/* copy so it works when m1 is the same pointer as m2 or m3 */
- copy_m4_m4(m2, m2_);
- copy_m4_m4(m3, m3_);
+ if (m2 == m1) {
+ copy_m4_m4(t2, m2);
+ m2= t2;
+ }
+
+ if (m3 == m1) {
+ copy_m4_m4(t3, m3);
+ m3= t3;
+ }
+
/* matrix product: m1[j][k] = m2[j][i].m3[i][k] */
m1[0][0] = m2[0][0]*m3[0][0] + m2[0][1]*m3[1][0] + m2[0][2]*m3[2][0] +
m2[0][3]*m3[3][0];
m1[0][1] = m2[0][0]*m3[0][1] + m2[0][1]*m3[1][1] + m2[0][2]*m3[2][1] +
m2[0][3]*m3[3][1];
@@ -317,7 +325,7 @@
vec[2]=x*mat[0][2] + y*mat[1][2] + mat[2][2]*vec[2] + mat[3][2];
}
-void mul_v3_m4v3(float *in, float mat[][4], float *vec)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
