[Bf-blender-cvs] [4e7dc28b901] experimental-build: Fixed deviation from master based on diff

Rohan Rathi noreply at git.blender.org
Fri Jul 28 07:32:13 CEST 2017


Commit: 4e7dc28b90149fbe6629264a0263cddc878e5e43
Author: Rohan Rathi
Date:   Fri Jul 28 11:00:41 2017 +0530
Branches: experimental-build
https://developer.blender.org/rB4e7dc28b90149fbe6629264a0263cddc878e5e43

Fixed deviation from master based on diff

Because of these lines of code, my squashed commit of branch soc-2017-normal-tools was unable to build.

===================================================================

M	.gitignore
M	doc/python_api/sphinx_doc_gen.py
M	intern/opensubdiv/opensubdiv_capi.cc
M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
D	sh.exe.stackdump
M	source/blender/blenkernel/intern/DerivedMesh.c
M	source/blender/bmesh/intern/bmesh_queries.c
M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M	source/blender/editors/object/object_add.c
M	source/blender/editors/transform/transform_snap_object.c
M	source/blender/python/intern/bpy_props.c
M	source/tools
M	tests/gtests/blenlib/BLI_kdopbvh_test.cc
M	tests/python/bl_load_py_modules.py

===================================================================

diff --git a/.gitignore b/.gitignore
index ed48c3faed4..3418afebb58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,8 +33,3 @@ Desktop.ini
 /doc/python_api/sphinx-in/
 /doc/python_api/sphinx-out/
 /doc/python_api/rst/bmesh.ops.rst
-/doc/python_api/rst/in_menu.png
-/doc/python_api/rst/menu_id.png
-/doc/python_api/rst/op_prop.png
-/doc/python_api/rst/run_script.png
-/doc/python_api/rst/spacebar.png
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index 098e2736ed1..7ad3bab1557 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1720,9 +1720,6 @@ def write_rst_contents(basepath):
         for info, info_desc in INFO_DOCS:
             fw("   %s <%s>\n\n" % (info_desc, info))
         fw("\n")
-        fw("- :ref:`Blender/Python Add-on Tutorial: a step by step guide on")
-        fw(" how to write an add-on from scratch <blender_manual:advanced_scripting_addon_tutorial>`\n")
-        fw("\n")
 
     fw(title_string("Application Modules", "=", double=True))
     fw(".. toctree::\n")
diff --git a/intern/opensubdiv/opensubdiv_capi.cc b/intern/opensubdiv/opensubdiv_capi.cc
index 8797651fc28..0a55a432cc6 100644
--- a/intern/opensubdiv/opensubdiv_capi.cc
+++ b/intern/opensubdiv/opensubdiv_capi.cc
@@ -427,9 +427,6 @@ int openSubdiv_supportGPUDisplay(void)
 
 int openSubdiv_getVersionHex(void)
 {
-<<<<<<< HEAD
-	return OPENSUBDIV_VERSION_NUMBER;
-=======
 #if defined(OPENSUBDIV_VERSION_NUMBER)
 	return OPENSUBDIV_VERSION_NUMBER;
 #elif defined(OPENSUBDIV_VERSION_MAJOR)
@@ -453,5 +450,4 @@ int openSubdiv_getVersionHex(void)
 #else
 	return 0;
 #endif
->>>>>>> ba8737c2ab00b5e04561396f68a5b13820ac2788
 }
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 19a637ce9f3..59495b4b590 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 19a637ce9f38112146daca394af4a7db1bae6687
+Subproject commit 59495b4b59077aa1cc68fffbdae1463af980f08e
diff --git a/release/scripts/addons b/release/scripts/addons
index 0926c1e7dcb..27970761a18 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 0926c1e7dcbe566d3a92116c6e8f91ba440f3789
+Subproject commit 27970761a18926abe1b0020aa350305e3109a537
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 706fce2d1d1..6a4f93c9b8f 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 706fce2d1d195096d081b92ba47b43a38dc120f7
+Subproject commit 6a4f93c9b8f36b19bd02087abf3d7f5983df035a
diff --git a/sh.exe.stackdump b/sh.exe.stackdump
deleted file mode 100644
index df08d06a82f..00000000000
--- a/sh.exe.stackdump
+++ /dev/null
@@ -1,24 +0,0 @@
-Exception: STATUS_STACK_OVERFLOW at rip=7FFC7355AAC7
-rax=0000000000001058 rbx=00000000007C1A70 rcx=58F5895562300000
-rdx=0000000000000001 rsi=00000000007C576C rdi=0000000000000001
-r8 =00000000007A99CC r9 =000000000000001B r10=00000000FFFF8000
-r11=00000000FFE03FA0 r12=0000000000000424 r13=00000000007C5750
-r14=0000000000000000 r15=0000000000000000
-rbp=00000000007C1A70 rsp=00000000FFFF97E0
-program=C:\Program Files\Git\usr\bin\sh.exe, pid 8116, thread unknown (0x14A4)
-cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B
-Stack trace:
-Frame        Function    Args
-000007C1A70  7FFC7355AAC7 (00180010018, 000007A3FB0, 000007C576C, 7FFC00000002)
-000007C1A70  7FFC6F6F637A (000007A3FB0, 000007C576C, 7FFC00000002, 000FFFF9BC0)
-000007C1A70  7FFC6F6F813E (000007C1ABC, 000FFFF9C20, 00000000420, 000007C59BC)
-000FFFF9C20  7FFC6F6F8836 (000FFFF9B00, 0000000038C, 00000000000, 00180277400)
-000FFFF9C20  7FFC70699FF6 (00000000001, 00000000000, 000FFFF9EF0, 00000000001)
-000FFFF9C20  7FFC7144BF13 (000FFFF9D40, 00000000000, 00000000420, 00000000001)
-000FFFF9C20  001800AA02B (000FFFF9CE0, 00000000000, 00000000000, 00000000000)
-000FFFF9D60  001800AABD5 (006000925B0, 00000000000, 00000000008, 001005E8C88)
-00000000000  0018011A43B (006000925B0, 00000000000, 00000000008, 001005E8C88)
-00000000000  000025CE458 (00000000000, 00000000008, 001005E8C88, 00000080002)
-00000000000  001004E1FCE (00000000008, 001005E8C88, 00000080002, 00000000000)
-00000000000  006000925B0 (00000000008, 001005E8C88, 00000080002, 00000000000)
-End of stack trace
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 6c47f0e2951..7eea8224ba1 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -3322,11 +3322,7 @@ void DM_calc_loop_tangents_step_0(
         const CustomData *loopData, bool calc_active_tangent,
         const char (*tangent_names)[MAX_NAME], int tangent_names_count,
         bool *rcalc_act, bool *rcalc_ren, int *ract_uv_n, int *rren_uv_n,
-<<<<<<< HEAD
-        char *ract_uv_name, char *rren_uv_name, char *rtangent_mask)
-=======
         char *ract_uv_name, char *rren_uv_name, short *rtangent_mask)
->>>>>>> ba8737c2ab00b5e04561396f68a5b13820ac2788
 {
 	/* Active uv in viewport */
 	int layer_index = CustomData_get_layer_index(loopData, CD_MLOOPUV);
diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c
index 3e85463cf95..668fb998254 100644
--- a/source/blender/bmesh/intern/bmesh_queries.c
+++ b/source/blender/bmesh/intern/bmesh_queries.c
@@ -1516,11 +1516,6 @@ float BM_loop_calc_face_angle(const BMLoop *l)
  */
 float BM_loop_calc_face_normal_safe_ex(const BMLoop *l, const float epsilon_sq, float r_normal[3])
 {
-<<<<<<< HEAD
-#define FEPSILON 1e-5f
-
-=======
->>>>>>> ba8737c2ab00b5e04561396f68a5b13820ac2788
 	/* Note: we cannot use result of normal_tri_v3 here to detect colinear vectors (vertex on a straight line)
 	 * from zero value, because it does not normalize both vectors before making crossproduct.
 	 * Instead of adding two costly normalize computations, just check ourselves for colinear case. */
@@ -1529,16 +1524,6 @@ float BM_loop_calc_face_normal_safe_ex(const BMLoop *l, const float epsilon_sq,
 	sub_v3_v3v3(v1, l->prev->v->co, l->v->co);
 	sub_v3_v3v3(v2, l->next->v->co, l->v->co);
 
-<<<<<<< HEAD
-	const float fac = (v2[0] == 0.0f) ? ((v2[1] == 0.0f) ? ((v2[2] == 0.0f) ? 0.0f : v1[2] / v2[2]) : v1[1] / v2[1]) : v1[0] / v2[0];
-
-	mul_v3_v3fl(v_tmp, v2, fac);
-	sub_v3_v3(v_tmp, v1);
-	if (fac != 0.0f && !is_zero_v3(v1) && len_manhattan_v3(v_tmp) > FEPSILON) {
-		/* Not co-linear, we can compute crossproduct and normalize it into normal. */
-		cross_v3_v3v3(r_normal, v1, v2);
-		normalize_v3(r_normal);
-=======
 	const float fac =
 	        ((v2[0] == 0.0f) ?
 	        ((v2[1] == 0.0f) ?
@@ -1550,7 +1535,6 @@ float BM_loop_calc_face_normal_safe_ex(const BMLoop *l, const float epsilon_sq,
 		/* Not co-linear, we can compute crossproduct and normalize it into normal. */
 		cross_v3_v3v3(r_normal, v1, v2);
 		return normalize_v3(r_normal);
->>>>>>> ba8737c2ab00b5e04561396f68a5b13820ac2788
 	}
 	else {
 		copy_v3_v3(r_normal, l->f->no);
@@ -1588,12 +1572,7 @@ float BM_loop_calc_face_normal(const BMLoop *l, float r_normal[3])
 	if (UNLIKELY(len == 0.0f)) {
 		copy_v3_v3(r_normal, l->f->no);
 	}
-<<<<<<< HEAD
-
-#undef FEPSILON
-=======
 	return len;
->>>>>>> ba8737c2ab00b5e04561396f68a5b13820ac2788
 }
 
 /**
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 359ee01652c..a90f8ff02b6 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -670,8 +670,6 @@ void DepsgraphNodeBuilder::build_particles(Scene *scene, Object *ob)
 	/* component for all particle systems */
 	ComponentDepsNode *psys_comp =
 	        add_component_node(&ob->id, DEG_NODE_TYPE_EVAL_PARTICLES);
-<<<<<<< HEAD
-=======
 
 	add_operation_node(psys_comp,
 	                   function_bind(BKE_particle_system_eval_init,
@@ -679,7 +677,6 @@ void DepsgraphNodeBuilder::build_particles(Scene *scene, Object *ob)
 	                                 scene,
 	                                 ob),
 	                   DEG_OPCODE_PSYS_EVAL_INIT);
->>>>>>> ba8737c2ab00b5e04561396f68a5b13820ac2788
 
 	/* particle systems */
 	LINKLIST_FOREACH (ParticleSystem *, psys, &ob->particlesystem) {
@@ -692,15 +689,7 @@ void DepsgraphNodeBuilder::build_particles(Scene *scene, Object *ob)
 		/* this particle system */
 		// TODO: for now, this will just be a placeholder "ubereval" node
 		add_operation_node(psys_comp,
-<<<<<<< HEAD
-		                   function_bind(BKE_particle_system_eval,
-		                                 _1,
-		                                 scene,
-		                                 ob,
-		                                 psys),
-=======
 		                   NULL,
->>>>>>> ba8737c2ab00b5e04561396f68a5b13820ac2788
 		                   DEG_OPCODE_PSYS_EVAL,
 		                   psys->name);
 	}
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 3fc960b3074..a1abcb96411 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1261,14 +1261,7 @@ void DepsgraphRelationBuilder::build_particles(Scene *scene, Object *ob)
 		if (!psys_check_enabled(ob, psys, G.is_rendering))
 			continue;
 
-<<<<<<< HEAD
-		/* TODO(sergey): Are all particle systems depends on time?
-		 * Hair without dynamics i.e.
-		 */
-		add_relation(time_src_key, psys_key, "TimeSrc -> PSys");
-=======
 		add_relation(eval_init_key, psys_key, "Init -> PSys");
->>>>>>> ba8737c2ab00b5e04561396f68a5b13820ac2788
 
 		/* TODO(sergey): Currently particle update is just a placeholder,
 		 * hook it to the ubereval node so particle system is getting updated
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 9d3d8defeaf..4ed1e85fb48 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1682,11 +1682,7 @@ static int convert_exec(bContext *C, wmOperator *op)
 			 * However, changing this is more des

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list