Revision: 42426
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42426
Author: campbellbarton
Date: 2011-12-04 23:13:28 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
manual sync with trunk - pulling in changes where the issues are not bmesh
spesific
- some merges added lines in multiple times
- removed some NULL checks that were only in bmesh
- enable cycles by default (was disabled because it used not to work)
- make formatting match
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h
branches/bmesh/blender/source/blender/blenkernel/BKE_paint.h
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
branches/bmesh/blender/source/blender/blenlib/BLI_math_color.h
branches/bmesh/blender/source/blender/blenlib/BLI_math_vector.h
branches/bmesh/blender/source/blender/blenlib/intern/math_vector_inline.c
branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
branches/bmesh/blender/source/blender/editors/mesh/editface.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/object/object_add.c
branches/bmesh/blender/source/blender/editors/object/object_relations.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
branches/bmesh/blender/source/blender/editors/physics/particle_edit.c
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawvolume.c
branches/bmesh/blender/source/blender/editors/space_view3d/space_view3d.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-12-04 23:04:43 UTC (rev
42425)
+++ branches/bmesh/blender/CMakeLists.txt 2011-12-04 23:13:28 UTC (rev
42426)
@@ -215,7 +215,7 @@
option(WITH_PYTHON_INSTALL "Copy system python into the blender install
folder" ON)
# Cycles
-option(WITH_CYCLES "Enable cycles Render
Engine" OFF)
+option(WITH_CYCLES "Enable cycles Render
Engine" ON)
option(WITH_CYCLES_TEST "Build cycles test
application" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA
architectures to build binaries for")
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h
2011-12-04 23:04:43 UTC (rev 42425)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_customdata.h
2011-12-04 23:13:28 UTC (rev 42426)
@@ -239,6 +239,7 @@
void *CustomData_get_layer_n(const struct CustomData *data, int type, int n);
void *CustomData_get_layer_named(const struct CustomData *data, int type,
const char
*name);
+
int CustomData_get_layer_index(const struct CustomData *data, int type);
int CustomData_get_layer_index_n(const struct CustomData *data, int type, int
n);
int CustomData_get_named_layer_index(const struct CustomData *data, int type,
const char *name);
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_paint.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_paint.h
2011-12-04 23:04:43 UTC (rev 42425)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_paint.h
2011-12-04 23:13:28 UTC (rev 42426)
@@ -86,7 +86,7 @@
/* Partial redraw */
int partial_redraw;
-
+
/* Used to cache the render of the active texture */
unsigned int texcache_side, *texcache, texcache_actual;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
2011-12-04 23:04:43 UTC (rev 42425)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
2011-12-04 23:13:28 UTC (rev 42426)
@@ -767,12 +767,10 @@
by a more flexible customdata system, but not simple */
if(!em) {
ClothModifierData *clmd = (ClothModifierData
*)modifiers_findByType(ob, eModifierType_Cloth);
- if (clmd) {
- KeyBlock *kb= key_get_keyblock(ob_get_key(ob),
clmd->sim_parms->shapekey_rest);
-
- if(kb->data)
- return kb->data;
- }
+ KeyBlock *kb= key_get_keyblock(ob_get_key(ob),
clmd->sim_parms->shapekey_rest);
+
+ if(kb->data)
+ return kb->data;
}
return NULL;
@@ -1170,7 +1168,7 @@
*/
if (deform_r) {
*deform_r = CDDM_from_mesh(me, ob);
-
+
if (build_shapekey_layers)
add_shapekey_layers(dm, me, ob);
@@ -2240,7 +2238,10 @@
attribs->tface[a].array =
tfdata->layers[layer].data;
attribs->tface[a].emOffset =
tfdata->layers[layer].offset;
attribs->tface[a].glIndex =
gattribs->layer[b].glindex;
- } /*else {
+ /* attribs->tface[a].glTexco =
gattribs->layer[b].gltexco; */ /* BMESH_TODO, trunk has this but not bmesh,
need to investigate whats going on here - campbell */
+ }
+ /* BMESH ONLY, may need to get this working?, otherwise
remove */
+ /* else {
int player;
CustomData *pdata = dm->getPolyDataLayout(dm);
@@ -2259,7 +2260,8 @@
attribs->tface[a].glTexco =
gattribs->layer[b].gltexco;
}
- }*/
+ }
+ */
}
else if(gattribs->layer[b].type == CD_MCOL) {
/* vertex colors */
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
2011-12-04 23:04:43 UTC (rev 42425)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/bvhutils.c
2011-12-04 23:13:28 UTC (rev 42426)
@@ -652,7 +652,7 @@
copy_v3_v3(co[2], vert[
face[i].v3 ].co);
if(face[i].v4)
copy_v3_v3(co[3], vert[ face[i].v4 ].co);
-
+
BLI_bvhtree_insert(tree, i, co[0], face[i].v4 ? 4 : 3);
}
}
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2011-12-04 23:04:43 UTC (rev 42425)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2011-12-04 23:13:28 UTC (rev 42426)
@@ -965,9 +965,7 @@
}
glEnd();
- } /*else {
- printf("eek in cddm draw mapped faces!\n");
- }*/
+ }
if (nors) nors += 3;
}
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
2011-12-04 23:04:43 UTC (rev 42425)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
2011-12-04 23:13:28 UTC (rev 42426)
@@ -49,7 +49,6 @@
#include "DNA_key_types.h"
#include "DNA_scene_types.h"
#include "DNA_vfont_types.h"
-#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "BKE_animsys.h"
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
2011-12-04 23:04:43 UTC (rev 42425)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
2011-12-04 23:13:28 UTC (rev 42426)
@@ -132,9 +132,6 @@
static int multires_get_level(Object *ob, MultiresModifierData *mmd, int
render)
{
- if (!ob || !mmd)
- return 0;
-
if(render)
return (mmd->modifier.scene)?
get_render_subsurf_level(&mmd->modifier.scene->r, mmd->renderlvl):
mmd->renderlvl;
else if(ob->mode == OB_MODE_SCULPT)
Modified: branches/bmesh/blender/source/blender/blenlib/BLI_math_color.h
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/BLI_math_color.h
2011-12-04 23:04:43 UTC (rev 42425)
+++ branches/bmesh/blender/source/blender/blenlib/BLI_math_color.h
2011-12-04 23:13:28 UTC (rev 42426)
@@ -86,12 +86,6 @@
void srgb_to_linearrgb_rgba_rgba_buf(float *col_to, float *col_from, int tot);
void linearrgb_to_srgb_rgba_rgba_buf(float *col_to, float *col_from, int tot);
-/* rgba buffer convenience functions */
-void srgb_to_linearrgb_rgba_buf(float *col, int tot);
-void linearrgb_to_srgb_rgba_buf(float *col, int tot);
-void srgb_to_linearrgb_rgba_rgba_buf(float *col_to, float *col_from, int tot);
-void linearrgb_to_srgb_rgba_rgba_buf(float *col_to, float *col_from, int tot);
-
/************************** Other *************************/
int constrain_rgb(float *r, float *g, float *b);
Modified: branches/bmesh/blender/source/blender/blenlib/BLI_math_vector.h
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/BLI_math_vector.h
2011-12-04 23:04:43 UTC (rev 42425)
+++ branches/bmesh/blender/source/blender/blenlib/BLI_math_vector.h
2011-12-04 23:13:28 UTC (rev 42426)
@@ -38,8 +38,6 @@
#ifdef BLI_MATH_INLINE_H
#include "intern/math_vector_inline.c"
-#else
-#define MINLINE
#endif
/************************************* Init
***********************************/
Modified:
branches/bmesh/blender/source/blender/blenlib/intern/math_vector_inline.c
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/intern/math_vector_inline.c
2011-12-04 23:04:43 UTC (rev 42425)
+++ branches/bmesh/blender/source/blender/blenlib/intern/math_vector_inline.c
2011-12-04 23:13:28 UTC (rev 42426)
@@ -510,7 +510,7 @@
return d;
}
-MINLINE double normalize_dv3(double n[3])
+MINLINE double normalize_v3_d(double n[3])
{
double d= n[0]*n[0] + n[1]*n[1] + n[2]*n[2];
Modified: branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
2011-12-04 23:04:43 UTC (rev 42425)
+++ branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
2011-12-04 23:13:28 UTC (rev 42426)
@@ -35,7 +35,6 @@
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
-#include <stddef.h>
#include <assert.h>
#include "MEM_guardedalloc.h"
@@ -318,7 +317,7 @@
void BLI_cleanup_path(const char *relabase, char *dir)
{
- ptrdiff_t a;
+ short a;
char *start, *eind;
if (relabase) {
BLI_path_abs(dir, relabase);
Modified: branches/bmesh/blender/source/blender/editors/mesh/editface.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/editface.c
2011-12-04 23:04:43 UTC (rev 42425)
+++ branches/bmesh/blender/source/blender/editors/mesh/editface.c
2011-12-04 23:13:28 UTC (rev 42426)
@@ -67,7 +67,6 @@
/* copy the face flags, most importantly selection from the mesh to the final
derived mesh,
* use in object mode when selecting faces (while painting) */
-
void paintface_flush_flags(Object *ob)
{
Mesh *me = get_mesh(ob);
@@ -78,9 +77,8 @@
int totface, totpoly;
int i;
- if (me==NULL || dm==NULL) {
+ if(me==NULL || dm==NULL)
return;
- }
/*
* Try to push updated mesh poly flags to three other data sets:
Modified: branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
2011-12-04 23:04:43 UTC (rev 42425)
+++ branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
2011-12-04 23:13:28 UTC (rev 42426)
@@ -129,12 +129,10 @@
break;
}
}
-
/* set index */
CustomData_set_layer_active(data, type, actindex);
}
-
if (rndlayerdata != layerdata) {
/* find index */
@@ -145,12 +143,10 @@
break;
}
}
-
/* set index */
CustomData_set_layer_render(data, type, rndindex);
}
-
if (clonelayerdata != layerdata) {
/* find index */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
